PHP 5.4 compatibility: remove call-time pass by reference

diff --git a/actions/profilecompletion.php b/actions/profilecompletion.php
index 045bf68a7fcbf2a01ae669af5c0bc1cdc7e2ad79..00dbe9d29d0ac6f1052eebf95ac920699af939b1 100644 (file)
--- a/actions/profilecompletion.php
+++ b/actions/profilecompletion.php
@@ -179,8 +179,7 @@ class ProfilecompletionAction extends Action
             else {
                 $cnt = $profile->find();
             }
-            // @todo FIXME: Call-time pass-by-reference has been deprecated.
-            Event::handle('EndProfileCompletionSearch', $this, &$profile, $search_engine);
+            Event::handle('EndProfileCompletionSearch', $this, $profile, $search_engine);
         }
 
         while ($profile->fetch()) {

diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index e44505b21c7cb6b3a58a93a410cef506925b7243..ffb934587706e6ebdb458b6c4a406e5fc96ebd1a 100644 (file)
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -109,7 +109,7 @@ class AimPlugin extends ImPlugin
 
     function onStartImDaemonIoManagers(&$classes)
     {
-        parent::onStartImDaemonIoManagers(&$classes);
+        parent::onStartImDaemonIoManagers($classes);
         $classes[] = new AimManager($this); // handles sending/receiving
         return true;
     }

diff --git a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
index a30ab110ab688212c320a1accd5dea68cec2c91c..dd93a51153b615c6558438c9f5a59fe11e34265d 100644 (file)
--- a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
+++ b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
@@ -267,6 +267,9 @@ class DomainStatusNetworkInstaller extends Installer
     function createDatabase()
     {
         // Create the New DB
+        /* FIXME
+         * Extension 'mysql_' is deprecated since PHP 5.5 - use mysqli instead.
+         */
         $res = mysql_connect($this->host, $this->rootname, $this->rootpass);
         if (!$res) {
             throw new ServerException("Cannot connect to {$this->host} as {$this->rootname}.");

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 2c52bb99bd32ca938e093fab178bc59f04835ea6..f74324c186ebb497585ef727ced9e9659029bf53 100644 (file)
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -147,7 +147,7 @@ class IrcPlugin extends ImPlugin {
      * @return boolean
      */
     public function onStartImDaemonIoManagers(&$classes) {
-        parent::onStartImDaemonIoManagers(&$classes);
+        parent::onStartImDaemonIoManagers($classes);
         $classes[] = new IrcManager($this); // handles sending/receiving
         return true;
     }

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index ccc190334d97f10c98f6a6aaba241b18f0bb0628..fdef94ce554d4e7ee3e0127927efcaf14c129f6b 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -120,7 +120,7 @@ class MsnPlugin extends ImPlugin {
      * @return boolean\r
      */\r
     public function onStartImDaemonIoManagers(&$classes) {\r
-        parent::onStartImDaemonIoManagers(&$classes);\r
+        parent::onStartImDaemonIoManagers($classes);\r
         $classes[] = new MsnManager($this); // handles sending/receiving\r
         return true;\r
     }\r

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 74e104d974b2785c5473f969ddc965571333abfb..99d43e47c5d3b6bcb94f2e5934e972280e8f5c12 100644 (file)
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -310,7 +310,7 @@ class XmppPlugin extends ImPlugin
 
     function onStartImDaemonIoManagers(&$classes)
     {
-        parent::onStartImDaemonIoManagers(&$classes);
+        parent::onStartImDaemonIoManagers($classes);
         $classes[] = new XmppManager($this); // handles pings/reconnects
         return true;
     }