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

Revert "Merged in Phergie changes"

Browse Source 
This reverts commit a3df3b6367.
This commit is contained in:
Luke Fitzgerald
2010-08-03 11:45:55 -07:00
parent c71319419b
commit 678911af24
30 changed files with 720 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Irc/extlib/phergie/Phergie/Plugin/Reload.php
View File

@@ -57,7 +57,6 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
if (!$this->plugins->hasPlugin($plugin)) {
echo 'DEBUG(Reload): ' . ucfirst($plugin) . ' is not loaded yet, loading', PHP_EOL;
$this->plugins->getPlugin($plugin);
$this->plugins->command->populateMethodCache();
return;
}
@@ -80,7 +79,7 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
}
$contents = preg_replace(
array('/^<\?(?:php)?/', '/class\s+' . $class . '/i'),
array('/<\?(?:php)?/', '/class\s+' . $class . '/i'),
array('', 'class ' . $newClass),
$contents
);
@@ -88,16 +87,10 @@ class Phergie_Plugin_Reload extends Phergie_Plugin_Abstract
$instance = new $newClass;
$instance->setName($plugin);
$instance->setEvent($this->event);
$this->plugins
->removePlugin($plugin)
->addPlugin($instance);
$this->plugins->command->populateMethodCache();
if ($this->plugins->hasPlugin('Help')) {
$this->plugins->help->populateRegistry();
}
echo 'DEBUG(Reload): Reloaded ', $class, ' to ', $newClass, PHP_EOL;
}
}