Commit 3ad3535c authored by mmn's avatar mmn

Merge commit 'refs/merge-requests/230' of...

Merge commit 'refs/merge-requests/230' of git://gitorious.org/statusnet/mainline into merge-requests/230
parents 7d8e199a 723f0f19
...@@ -179,8 +179,7 @@ class ProfilecompletionAction extends Action ...@@ -179,8 +179,7 @@ class ProfilecompletionAction extends Action
else { else {
$cnt = $profile->find(); $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()) { while ($profile->fetch()) {
......
...@@ -48,6 +48,17 @@ class Daemon ...@@ -48,6 +48,17 @@ class Daemon
function background() function background()
{ {
/* Starting PHP 5.4 (dotdeb), maybe earlier for some version/distrib
* seems MySQL connection using mysqli driver get lost when fork.
* Need to unset it so that child process recreate it.
*
* Not needed if using mysql driver (but it's deprecated starting PHP 5.5)
*
* @todo FIXME cleaner way to do it ?
*/
global $_DB_DATAOBJECT;
unset($_DB_DATAOBJECT['CONNECTIONS']);
$pid = pcntl_fork(); $pid = pcntl_fork();
if ($pid < 0) { // error if ($pid < 0) { // error
common_log(LOG_ERR, "Could not fork."); common_log(LOG_ERR, "Could not fork.");
......
...@@ -109,7 +109,7 @@ class AimPlugin extends ImPlugin ...@@ -109,7 +109,7 @@ class AimPlugin extends ImPlugin
function onStartImDaemonIoManagers(&$classes) function onStartImDaemonIoManagers(&$classes)
{ {
parent::onStartImDaemonIoManagers(&$classes); parent::onStartImDaemonIoManagers($classes);
$classes[] = new AimManager($this); // handles sending/receiving $classes[] = new AimManager($this); // handles sending/receiving
return true; return true;
} }
......
...@@ -267,6 +267,9 @@ class DomainStatusNetworkInstaller extends Installer ...@@ -267,6 +267,9 @@ class DomainStatusNetworkInstaller extends Installer
function createDatabase() function createDatabase()
{ {
// Create the New DB // 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); $res = mysql_connect($this->host, $this->rootname, $this->rootpass);
if (!$res) { if (!$res) {
throw new ServerException("Cannot connect to {$this->host} as {$this->rootname}."); throw new ServerException("Cannot connect to {$this->host} as {$this->rootname}.");
......
...@@ -147,7 +147,7 @@ class IrcPlugin extends ImPlugin { ...@@ -147,7 +147,7 @@ class IrcPlugin extends ImPlugin {
* @return boolean * @return boolean
*/ */
public function onStartImDaemonIoManagers(&$classes) { public function onStartImDaemonIoManagers(&$classes) {
parent::onStartImDaemonIoManagers(&$classes); parent::onStartImDaemonIoManagers($classes);
$classes[] = new IrcManager($this); // handles sending/receiving $classes[] = new IrcManager($this); // handles sending/receiving
return true; return true;
} }
......
...@@ -120,7 +120,7 @@ class MsnPlugin extends ImPlugin { ...@@ -120,7 +120,7 @@ class MsnPlugin extends ImPlugin {
* @return boolean * @return boolean
*/ */
public function onStartImDaemonIoManagers(&$classes) { public function onStartImDaemonIoManagers(&$classes) {
parent::onStartImDaemonIoManagers(&$classes); parent::onStartImDaemonIoManagers($classes);
$classes[] = new MsnManager($this); // handles sending/receiving $classes[] = new MsnManager($this); // handles sending/receiving
return true; return true;
} }
......
...@@ -249,7 +249,7 @@ class TwitterBridgePlugin extends Plugin ...@@ -249,7 +249,7 @@ class TwitterBridgePlugin extends Plugin
* *
* @return boolean hook return * @return boolean hook return
*/ */
function onGetValidDaemons($daemons) function onGetValidDaemons(&$daemons)
{ {
if (self::hasKeys()) { if (self::hasKeys()) {
array_push( array_push(
......
...@@ -310,7 +310,7 @@ class XmppPlugin extends ImPlugin ...@@ -310,7 +310,7 @@ class XmppPlugin extends ImPlugin
function onStartImDaemonIoManagers(&$classes) function onStartImDaemonIoManagers(&$classes)
{ {
parent::onStartImDaemonIoManagers(&$classes); parent::onStartImDaemonIoManagers($classes);
$classes[] = new XmppManager($this); // handles pings/reconnects $classes[] = new XmppManager($this); // handles pings/reconnects
return true; return true;
} }
...@@ -440,7 +440,7 @@ class XmppPlugin extends ImPlugin ...@@ -440,7 +440,7 @@ class XmppPlugin extends ImPlugin
* *
* @return boolean hook return * @return boolean hook return
*/ */
function onGetValidDaemons($daemons) function onGetValidDaemons(&$daemons)
{ {
if( isset($this->server) && if( isset($this->server) &&
isset($this->port) && isset($this->port) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment