summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2010-12-29 14:52:41 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2010-12-29 14:52:41 -0500
commitc5b68710b70cf6f01ec5f7117930d9b2c1f7f15e (patch)
tree9da4d3af4dd164551140430494968e5b5bf0580b
parent7e5c79095f86d5d92237ec32ced05316518c6e22 (diff)
It appears that I made a few mistakes in which changes I had git commit, and reject.1.0.x
* actions/pluginsadminpanel.php: o replace a `;' with a `.'; accidentally rejected change o change the text 'Default plugins' to 'Available plugins'; didn't get applied * lib/pliginlist.php o un-delete line from metaInfo(); ? o apply changes to getPluginVersion()
-rw-r--r--actions/pluginsadminpanel.php4
-rw-r--r--lib/pluginlist.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php
index f095906fa..04cf95872 100644
--- a/actions/pluginsadminpanel.php
+++ b/actions/pluginsadminpanel.php
@@ -67,7 +67,7 @@ class PluginsadminpanelAction extends AdminPanelAction
// TRANS: Instructions at top of plugin admin page.
return _('Additional plugins can be enabled and configured manually. ' .
'See the <a href="http://status.net/wiki/Plugins">online plugin ' .
- 'documentation</a> for more details.');
+ 'documentation</a> for more details.').
'<form action="'.common_config('site','path').'/plugindata.php">'.
'<input type="submit" value="'._('Refresh Plugin Data').'" />'.
'</form>';
@@ -84,7 +84,7 @@ class PluginsadminpanelAction extends AdminPanelAction
$this->elementStart('fieldset', array('id' => 'settings_plugins_default'));
// TRANS: Admin form section header
- $this->element('legend', null, _('Default plugins'), 'default');
+ $this->element('legend', null, _('Available plugins'), 'default');
$this->showPlugins();
diff --git a/lib/pluginlist.php b/lib/pluginlist.php
index 48ef1cb81..c0ad41c69 100644
--- a/lib/pluginlist.php
+++ b/lib/pluginlist.php
@@ -170,6 +170,7 @@ class PluginListItem extends Widget
*/
function metaInfo()
{
+ $versions = self::getPluginVersions();
return $versions[$this->plugin];
}
@@ -180,8 +181,7 @@ class PluginListItem extends Widget
protected static function getPluginVersions()
{
if (!is_array(self::$versions)) {
- $versions = array();
- Event::handle('PluginVersion', array(&$versions));
+ $versions = common_plugindata();
self::$versions = $versions;
}
return self::$versions;