From c23efdbdb0c577d78d341aa10398fee5a58420fc Mon Sep 17 00:00:00 2001
From: Jean Baptiste Favre <statusnet@jbfavre.org>
Date: Wed, 19 Jun 2013 11:16:05 +0200
Subject: [PATCH] PHP 5.4 compatibility: remove call-time pass by reference

---
 actions/profilecompletion.php                                  | 3 +--
 plugins/Aim/AimPlugin.php                                      | 2 +-
 .../DomainStatusNetwork/lib/domainstatusnetworkinstaller.php   | 3 +++
 plugins/Irc/IrcPlugin.php                                      | 2 +-
 plugins/Msn/MsnPlugin.php                                      | 2 +-
 plugins/Xmpp/XmppPlugin.php                                    | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/actions/profilecompletion.php b/actions/profilecompletion.php
index 045bf68a7f..00dbe9d29d 100644
--- 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 e44505b21c..ffb9345877 100644
--- 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 a30ab110ab..dd93a51153 100644
--- 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 2c52bb99bd..f74324c186 100644
--- 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 ccc190334d..fdef94ce55 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -120,7 +120,7 @@ class MsnPlugin extends ImPlugin {
      * @return boolean
      */
     public function onStartImDaemonIoManagers(&$classes) {
-        parent::onStartImDaemonIoManagers(&$classes);
+        parent::onStartImDaemonIoManagers($classes);
         $classes[] = new MsnManager($this); // handles sending/receiving
         return true;
     }
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 74e104d974..99d43e47c5 100644
--- 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;
     }