Upgraded to Elgg 1.8.1.

diff --git a/lib/dokuwiki.php b/lib/dokuwiki.php
index 9881c0e55f00fd071849c498dbc1667bcb14ffb8..b49e4d4ee5a58c389872bcd98a9b0d05271c2ca8 100644 (file)
--- a/lib/dokuwiki.php
+++ b/lib/dokuwiki.php
@@ -58,5 +58,3 @@ function dokuwiki_create_datafolder($path) {
        dokuwiki_recurse_copy($orig, $path);
        
 }
-       
-?>

diff --git a/manifest.xml b/manifest.xml
index e0821710dbfc7a857ce21530045243a5f45b53f6..9c9ca808f446621c4ac1f58e3af95a7b13c1eb64 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
        <name>Dokuwiki</name>
-       <author>Lorea</author>
-       <version>1.4.1</version>
-       <category>bundled</category>
+       <author>Lorea developers</author>
+       <version>1.4.2</version>
+       <category>unbundled</category>
        <category>content</category>
-       <category>widget</category>
        <description>Dokuwiki integration for Elgg</description>
        <website>https://lorea.cc/</website>
        <copyright>(C) Lorea 2011</copyright>
-       <license>GNU Public License version 2</license>
+       <license>GNU General Public License, version 2 or later</license>
        <requires>
-               <type>elgg_version</type>
-               <version>2011061200</version>
+               <type>elgg_release</type>
+               <version>1.8</version>
        </requires>
        <requires>
                 <type>priority</type>
                 <priority>after</priority>
                 <plugin>groups</plugin>
         </requires>
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>

diff --git a/start.php b/start.php
index 7a31a6ca77f6adad886681ec87b4ed106ec2255b..05c7c01f27069cb568d3fa075ab0c7b101251d83 100644 (file)
--- a/start.php
+++ b/start.php
@@ -57,7 +57,7 @@ function dokuwiki_init(){
                if ($page[0] === "all") {
                        elgg_set_context("search");
                        include(elgg_get_plugins_path().'dokuwiki/index.php');
-                       return;
+                       return true;
                }
                
                elgg_set_context("dokuwiki");
@@ -65,7 +65,7 @@ function dokuwiki_init(){
                $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();
+                       return false;
                $parsed_url = parse_url(elgg_get_site_url().'dokuwiki/');
                $url_base = $parsed_url['path'];
                if (is_numeric($page[0])) {
@@ -74,14 +74,16 @@ function dokuwiki_init(){
                        
                        if (($ent && $ent instanceof ElggGroup) && $ent->dokuwiki_enable !== 'yes') {
                                // wiki not activated for this group. bail out.
-                               forward();
+                               elgg_pop_context();
+                               return false;
                        }
                        if ($ent && (/*$ent instanceof ElggUser ||*/ $ent instanceof ElggGroup)) {
                                elgg_set_page_owner_guid($entity_guid);
                                $data_path = elgg_get_data_path().'wikis/'.$entity_guid;
                        } else {
                                // can't see the group
-                               forward();
+                               elgg_pop_context();
+                               return false;
                        }
                        $page = array_slice($page, 1); // pop first element
                        define('DOKU_REL', $url_base.$entity_guid."/");
@@ -135,7 +137,7 @@ function dokuwiki_init(){
                                $doku_body = elgg_view('dokuwiki/index',array('page'=>implode("/",$page)));
                        echo $doku_body;
                }
-               return;
+               return true;
        }
 
        /**