From: Ben Klang <ben@alkaloid.net>
Date: Sun, 10 Jan 2010 18:58:46 +0000 (-0500)
Subject: Shout: Fix references to objects
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e006f04198436001002cb2134d7c3dc7c1ab9e5b;p=horde.git

Shout: Fix references to objects
---

diff --git a/shout/ajax.php b/shout/ajax.php
index 560d0bc8d..45137d374 100644
--- a/shout/ajax.php
+++ b/shout/ajax.php
@@ -33,7 +33,7 @@ try {
         ($action != 'LogOut')) {
         //FIXME: The below is certain to break since it relies on classes I did
         //       not yet copy from IMP.
-        $notification = Horde_Notification::singleton();
+        $notification = &Horde_Notification::singleton();
         $shout_notify = $notification->attach('status', array('viewmode' => 'dimp'), 'Shout_Notification_Listener_Status');
         $notification->push(str_replace('&amp;', '&', Horde_Auth::getLogoutUrl(array('reason' => Horde_Auth::REASON_SESSION))), 'shout.timeout', array('content.raw'));
         Horde::sendHTTPResponse(Horde::prepareResponse(null, $shout_notify), 'json');
diff --git a/shout/lib/Application.php b/shout/lib/Application.php
index b29e1c06a..75deba22e 100644
--- a/shout/lib/Application.php
+++ b/shout/lib/Application.php
@@ -63,7 +63,7 @@ class Shout_Application extends Horde_Registry_Application
                 $contexts = false;
             }
 
-            $notification = Horde_Notification::singleton();
+            $notification = &Horde_Notification::singleton();
             $GLOBALS['notification'] = $notification;
             $notification->attach('status');
 
diff --git a/shout/lib/Shout.php b/shout/lib/Shout.php
index c7690123f..357560037 100644
--- a/shout/lib/Shout.php
+++ b/shout/lib/Shout.php
@@ -53,7 +53,7 @@ class Shout
     static public function getTabs($context, &$vars)
     {
         global $shout;
-        $perms = Horde_Perms::singleton();
+        $perms = &Horde_Perms::singleton();
 
         $permprefix = 'shout:contexts:' . $context;
 
@@ -100,7 +100,7 @@ class Shout
     {
         if (Horde_Auth::isAdmin()) { return true; }
 
-        $perms = Horde_Perms::singleton();
+        $perms = &Horde_Perms::singleton();
         if ($permmask === null) {
             $permmask = PERMS_SHOW|PERMS_READ;
         }