Upgraded functions in dokuwiki modifications

diff --git a/lib/dokuwiki/inc/actions.php b/lib/dokuwiki/inc/actions.php
index 7673683ca5266c185d27c55d62de48a1cc68f7d3..ed3c1266634df3a82988940965c6cc5c14c6e5b6 100644 (file)
--- a/lib/dokuwiki/inc/actions.php
+++ b/lib/dokuwiki/inc/actions.php
@@ -147,7 +147,7 @@ function act_dispatch(){
   $evt->advise_after();
   unset($evt);
   if ($ACT == 'save') {
-    $user = get_loggedin_user();
+    $user = elgg_get_logged_in_user_entity();
     $doku = current_dokuwiki_entity();
     $group = get_entity($doku->container_guid);
     add_to_river('river/dokuwiki', 'wiki/'.$ACT.'/'.$QUERY, $user->getGUID(), $doku->getGUID(), $group->access_id);

diff --git a/lib/dokuwiki/inc/auth/elgg.class.php b/lib/dokuwiki/inc/auth/elgg.class.php
index f8b575564cabc4886954e1d3c37b5ea6b167d6d1..c0a2918322b9faacfbd6fa07fe0c4f55af65a369 100644 (file)
--- a/lib/dokuwiki/inc/auth/elgg.class.php
+++ b/lib/dokuwiki/inc/auth/elgg.class.php
@@ -75,7 +75,7 @@ class auth_elgg extends auth_basic {
        if (!$user)
                return false;
        //error_log("getUserData:".$username);
-       $page_owner = page_owner_entity();
+       $page_owner = elgg_get_page_owner_entity();
        $grps = array();
        if ($page_owner instanceof ElggGroup) {
                if ($page_owner->canEdit($user->getGUID())) {