From c5b68710b70cf6f01ec5f7117930d9b2c1f7f15e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 29 Dec 2010 14:52:41 -0500
Subject: It appears that I made a few mistakes in which changes I had git
 commit, and reject.

* 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()
---
 actions/pluginsadminpanel.php | 4 ++--
 lib/pluginlist.php            | 4 ++--
 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;
-- 
cgit v1.2.3