Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark

diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 2d94a43583499978b8e0849d8a042de61f6ffceb..d23e26697a1b3010b9a2918faa2f4bda6122ec82 100644 (file)
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -154,6 +154,7 @@ class BookmarkPlugin extends MicroAppPlugin
             include_once $dir.'/'.$cls.'.php';
             return false;
         case 'BookmarkForm':
+        case 'InitialBookmarkForm':
         case 'DeliciousBackupImporter':
         case 'DeliciousBookmarkImporter':
             include_once $dir.'/'.strtolower($cls).'.php';
@@ -217,11 +218,11 @@ class BookmarkPlugin extends MicroAppPlugin
      */
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'Sample',
+        $versions[] = array('name' => 'Bookmark',
                             'version' => self::VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Bookmark',
-                            'rawdescription' =>
+                            'description' =>
                             // TRANS: Plugin description.
                             _m('Simple extension for supporting bookmarks.'));
         return true;