diff options
| -rw-r--r-- | plugins/YammerImport/YammerImportPlugin.php | 4 | ||||
| -rw-r--r-- | plugins/YammerImport/lib/sn_yammerclient.php (renamed from plugins/YammerImport/sn_yammerclient.php) | 0 | ||||
| -rw-r--r-- | plugins/YammerImport/lib/yammerimporter.php (renamed from plugins/YammerImport/yammerimporter.php) | 0 | ||||
| -rw-r--r-- | plugins/YammerImport/scripts/yamdump.php (renamed from plugins/YammerImport/yamdump.php) | 2 | ||||
| -rw-r--r-- | plugins/YammerImport/scripts/yammer-import.php (renamed from plugins/YammerImport/yammer-import.php) | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php index a3520d8a8..79b8260b6 100644 --- a/plugins/YammerImport/YammerImportPlugin.php +++ b/plugins/YammerImport/YammerImportPlugin.php @@ -68,9 +68,7 @@ class YammerImportPlugin extends Plugin switch ($lower) { case 'sn_yammerclient': case 'yammerimporter': - case 'yammerimqueuehandler': - case 'importyammeraction': - require_once "$base/$lower.php"; + require_once "$base/lib/$lower.php"; return false; default: return true; diff --git a/plugins/YammerImport/sn_yammerclient.php b/plugins/YammerImport/lib/sn_yammerclient.php index 8f9f1d413..8f9f1d413 100644 --- a/plugins/YammerImport/sn_yammerclient.php +++ b/plugins/YammerImport/lib/sn_yammerclient.php diff --git a/plugins/YammerImport/yammerimporter.php b/plugins/YammerImport/lib/yammerimporter.php index 9ce0d1e58..9ce0d1e58 100644 --- a/plugins/YammerImport/yammerimporter.php +++ b/plugins/YammerImport/lib/yammerimporter.php diff --git a/plugins/YammerImport/yamdump.php b/plugins/YammerImport/scripts/yamdump.php index 809baa122..a358777ad 100644 --- a/plugins/YammerImport/yamdump.php +++ b/plugins/YammerImport/scripts/yamdump.php @@ -4,7 +4,7 @@ if (php_sapi_name() != 'cli') { die('no'); } -define('INSTALLDIR', dirname(dirname(dirname(__FILE__)))); +define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__))))); require INSTALLDIR . "/scripts/commandline.inc"; diff --git a/plugins/YammerImport/yammer-import.php b/plugins/YammerImport/scripts/yammer-import.php index 4931d1bc5..ac258e1c7 100644 --- a/plugins/YammerImport/yammer-import.php +++ b/plugins/YammerImport/scripts/yammer-import.php @@ -4,7 +4,7 @@ if (php_sapi_name() != 'cli') { die('no'); } -define('INSTALLDIR', dirname(dirname(dirname(__FILE__)))); +define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__))))); require INSTALLDIR . "/scripts/commandline.inc"; |