eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

$_PEAR now defined globally as new PEAR, so no static calls are made

Browse Source
This commit is contained in:
Mikael Nordfeldth
2013-09-23 22:27:17 +02:00
parent 8205c56e25
commit 9d3abc3600
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/statusnet.php
View File

@@ -264,7 +264,7 @@ class StatusNet
*/
public static function initDefaults($server, $path)
{
global $_server, $_path, $config;
global $_server, $_path, $config, $_PEAR;
Event::clearHandlers();
self::$plugins = array();
@@ -296,7 +296,7 @@ class StatusNet
// default configuration, overwritten in config.php
// Keep DB_DataObject's db config synced to ours...
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
$config['db'] = &$_PEAR->getStaticProperty('DB_DataObject','options');
$config['db'] = $default['db'];