Changed paths from lib/dokuwiki to vendors/dokuwiki

diff --git a/start.php b/start.php
index ae5475e2478aafcb570a723e490aa680268685d8..2dfe4b7e09dacc882e123ab6209f7cb709a27bd3 100644 (file)
--- a/start.php
+++ b/start.php
@@ -62,7 +62,7 @@ function dokuwiki_init(){
                
                elgg_set_context("dokuwiki");
 
-               $dokuwiki_path = elgg_get_plugins_path().'dokuwiki/lib/dokuwiki/';
+               $dokuwiki_path = elgg_get_plugins_path().'dokuwiki/vendors/dokuwiki/';
                $doku = current_dokuwiki_entity();
                if (!$doku) // can fail if there is no user and wiki doesnt exist
                        forward();
@@ -96,7 +96,7 @@ function dokuwiki_init(){
                        define('DOKU_URL', elgg_get_site_url().'dokuwiki/');
                }
                define('DOKU_INC', $dokuwiki_path);
-               define('DOKU_MEDIA', elgg_get_site_url().'mod/dokuwiki/lib/dokuwiki/');
+               define('DOKU_MEDIA', elgg_get_site_url().'mod/dokuwiki/vendors/dokuwiki/');
                define('DOKU_CONF', $dokuwiki_path."conf/");
 
                dokuwiki_create_datafolder($data_path);

diff --git a/views/default/dokuwiki/index.php b/views/default/dokuwiki/index.php
index dd20235ddad9efa4329ab0bcfe4b7f53836af994..e1c1120f81bef5dc793694ad7c66947f021f9d7d 100644 (file)
--- a/views/default/dokuwiki/index.php
+++ b/views/default/dokuwiki/index.php
@@ -1,7 +1,6 @@
 <?php
        global $CONFIG;
-       //error_log("DOKUWIKI_OPEN:".$CONFIG->pluginspath.'dokuwiki/lib/dokuwiki/'.$vars['page']);
-       $destfile = $CONFIG->pluginspath.'dokuwiki/lib/dokuwiki/'.$vars['page'];
+       $destfile = $CONFIG->pluginspath.'dokuwiki/vendors/dokuwiki/'.$vars['page'];
        if (file_exists($destfile))
               include($destfile);
 ?>