[icinga-checkins] icinga.org: icinga-web/master: * fixes some generic php bugs (fixes #256), thanks to Ixan.

git at icinga.org git at icinga.org
Wed Jan 27 09:51:44 CET 2010


Module: icinga-web
Branch: master
Commit: 46cef5af7404182892e6337eea5e7d89957ab8e2
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=46cef5af7404182892e6337eea5e7d89957ab8e2

Author: mhein <mhein at sasquatch.local.itsocks.de>
Date:   Wed Jan 27 09:45:31 2010 +0100

* fixes some generic php bugs (fixes #256), thanks to Ixan.

---

 lib/appkit/auth/AppKitSecurityUser.class.php |    2 +-
 lib/appkit/class/AppKitBaseClass.class.php   |    2 +-
 lib/appkit/queue/AppKitQueue.class.php       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/appkit/auth/AppKitSecurityUser.class.php b/lib/appkit/auth/AppKitSecurityUser.class.php
old mode 100755
new mode 100644
index 46ffb08..6a22079
--- a/lib/appkit/auth/AppKitSecurityUser.class.php
+++ b/lib/appkit/auth/AppKitSecurityUser.class.php
@@ -77,7 +77,7 @@ class AppKitSecurityUser extends AgaviRbacSecurityUser {
 	 * @author Marius Hein
 	 */
 	private function loadUserAttribute(NsmUser &$user) {
-		$this->setAttribute('userobj', &$user);
+		$this->setAttributeByRef('userobj', &$user);
 		return true;
 	}
 	
diff --git a/lib/appkit/class/AppKitBaseClass.class.php b/lib/appkit/class/AppKitBaseClass.class.php
old mode 100755
new mode 100644
index 795ec03..626091b
--- a/lib/appkit/class/AppKitBaseClass.class.php
+++ b/lib/appkit/class/AppKitBaseClass.class.php
@@ -65,7 +65,7 @@ class AppKitException extends Exception {
 			parent::__construct( vsprintf($format, $args) );
 		}
 		else {
-			call_user_method_array('parent::__construct', &$this, $args);
+			call_user_method_array('parent::__construct', $this, $args);
 		}
 	}
 	
diff --git a/lib/appkit/queue/AppKitQueue.class.php b/lib/appkit/queue/AppKitQueue.class.php
old mode 100755
new mode 100644
index b1fbe43..6b47114
--- a/lib/appkit/queue/AppKitQueue.class.php
+++ b/lib/appkit/queue/AppKitQueue.class.php
@@ -5,7 +5,7 @@ class AppKitQueue extends AppKitArrayContainer implements IteratorAggregate {
 	private $queue_objects = array ();
 	
 	public function __construct() {
-		$this->initArrayContainer(&$this->queue_objects);
+		$this->initArrayContainer($this->queue_objects);
 	}
 	
 	public function enqueue(AppKitQueueItem $item) {





More information about the icinga-checkins mailing list