Changeset 2095:1fceb8fc56a6 for plugins/importExport/_prepend.php

Timestamp:

09/25/13 22:04:57 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Now load _prepend.php files from dcModules::loadModuleFile(), cleanup officials plugins prepend files, addresses #1471, addresses #1716

File:

• plugins/importExport/_prepend.php (modified) (2 diffs)

plugins/importExport/_prepend.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 if (!defined('DC_RC_PATH')) { return; }
-
-global $__autoload;
 
 $__autoload['dcIeModule'] =   dirname(__FILE__).'/inc/class.dc.ieModule.php';
@@ -28 +26 @@
 $__autoload['flatExport'] =   dirname(__FILE__).'/inc/flat/class.flat.export.php';
 
-$this->core->addBehavior('importExportModules','registerIeModules');
+$core->addBehavior('importExportModules','registerIeModules');
 
-function registerIeModules($modules)
+function registerIeModules($modules, $core)
 {
-     $modules['import'] = array_merge($modules['import'],array('dcImportFlat'));
-     $modules['import'] = array_merge($modules['import'],array('dcImportFeed'));
+     $modules['import'] = array_merge($modules['import'], array('dcImportFlat'));
+     $modules['import'] = array_merge($modules['import'], array('dcImportFeed'));
      
-     $modules['export'] = array_merge($modules['export'],array('dcExportFlat'));
+     $modules['export'] = array_merge($modules['export'], array('dcExportFlat'));
      
-     if ($GLOBALS['core']->auth->isSuperAdmin()) {
-          $modules['import'] = array_merge($modules['import'],array('dcImportDC1'));
-          $modules['import'] = array_merge($modules['import'],array('dcImportWP'));
+     if ($core->auth->isSuperAdmin()) {
+          $modules['import'] = array_merge($modules['import'], array('dcImportDC1'));
+          $modules['import'] = array_merge($modules['import'], array('dcImportWP'));
      }
 }