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

[quix0rs-gnu-social.git] / plugins / YammerImport / YammerImportPlugin.php

diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php
index 98c6ecd0ab13349f97fb884a47eb713039489aa7..41d8d08a663b58f9d381405b861f5290c05bd870 100644 (file)
--- a/plugins/YammerImport/YammerImportPlugin.php
+++ b/plugins/YammerImport/YammerImportPlugin.php
@@ -34,9 +34,9 @@ class YammerImportPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect('admin/yammer',
+        $m->connect('panel/yammer',
                     array('action' => 'yammeradminpanel'));
-        $m->connect('admin/yammer/auth',
+        $m->connect('panel/yammer/auth',
                     array('action' => 'yammerauth'));
         return true;
     }
@@ -66,7 +66,8 @@ class YammerImportPlugin extends Plugin
                         'Yammer_notice',
                         'Yammer_notice_stub');
         foreach ($tables as $table) {
-            $schema->ensureTable(strtolower($table), $table::schemaDef());
+            $schemaDef = call_user_func(array($table, 'schemaDef'));
+            $schema->ensureTable(strtolower($table), $schemaDef);
         }
 
         return true;