Merge branch 'inblob' of git@gitorious.org:~evan/statusnet/evans-mainline into inblob

[quix0rs-gnu-social.git] / plugins / FeedSub / FeedSubPlugin.php

diff --git a/plugins/FeedSub/FeedSubPlugin.php b/plugins/FeedSub/FeedSubPlugin.php
index 36d4e78023545b862d97d6d6bec9509e5120c5d0..e49e2a648a044d93d48b9a7eca1523a2f6032e38 100644 (file)
--- a/plugins/FeedSub/FeedSubPlugin.php
+++ b/plugins/FeedSub/FeedSubPlugin.php
@@ -51,7 +51,6 @@ class FeedSubPlugin extends Plugin
      * @param Net_URL_Mapper $m path-to-action mapper
      * @return boolean hook return
      */
-
     function onRouterInitialized($m)
     {
         $m->connect('feedsub/callback/:feed',
@@ -74,8 +73,8 @@ class FeedSubPlugin extends Plugin
         $action_name = $action->trimmed('action');
 
         $action->menuItem(common_local_url('feedsubsettings'),
-                          dgettext('FeebSubPlugin', 'Feeds'),
-                          dgettext('FeedSubPlugin', 'Feed subscription options'),
+                          _m('Feeds'),
+                          _m('Feed subscription options'),
                           $action_name === 'feedsubsettings');
 
         return true;
@@ -106,12 +105,11 @@ class FeedSubPlugin extends Plugin
         return true;
     }
 
-    /*
-    // auto increment seems to be broken
     function onCheckSchema() {
+        // warning: the autoincrement doesn't seem to set.
+        // alter table feedinfo change column id id int(11) not null  auto_increment;
         $schema = Schema::get();
-        $schema->ensureDataObject('Feedinfo');
+        $schema->ensureTable('feedinfo', Feedinfo::schemaDef());
         return true;
     }
-    */
 }