Removed namespace

Removed tl_settings.php files
kozi · Sep 30, 2014 · 19b4366 · 19b4366
1 parent 5c50939
commit 19b4366
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 55 deletions.
diff --git a/contao/classes/MetafieldsHelper.php b/contao/classes/MetafieldsHelper.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-namespace AdditionalMetafields;
-
 /**
  * Class MetafieldsHelper
  *

diff --git a/contao/config/autoload.php b/contao/config/autoload.php
@@ -13,12 +13,10 @@
  * @filesource
  */
 
-ClassLoader::addNamespace('AdditionalMetafields');
-
 ClassLoader::addClasses(array(
-    'AdditionalMetafields\MetafieldsHelper'          => 'system/modules/additional_metafields/classes/MetafieldsHelper.php',
-    'AdditionalMetafields\MetaWizardPlus'            => 'system/modules/additional_metafields/widgets/MetaWizardPlus.php',
-    'AdditionalMetafields\MetafieldsModel'           => 'system/modules/additional_metafields/models/MetafieldsModel.php',
+    'MetafieldsHelper'          => 'system/modules/additional_metafields/classes/MetafieldsHelper.php',
+    'MetaWizardPlus'            => 'system/modules/additional_metafields/widgets/MetaWizardPlus.php',
+    'MetafieldsModel'           => 'system/modules/additional_metafields/models/MetafieldsModel.php',
 ));
 
 
diff --git a/contao/config/config.php b/contao/config/config.php
@@ -13,12 +13,10 @@
  * @filesource
  */
 
-$GLOBALS['TL_HOOKS']['getContentElement'][]         = array('AdditionalMetafields\MetafieldsHelper', 'injectMetaData');
-$GLOBALS['TL_HOOKS']['parseArticles'][]             = array('AdditionalMetafields\MetafieldsHelper', 'injectMetaDataArticleImage');
+$GLOBALS['TL_HOOKS']['getContentElement'][]         = array('MetafieldsHelper', 'injectMetaData');
+$GLOBALS['TL_HOOKS']['parseArticles'][]             = array('MetafieldsHelper', 'injectMetaDataArticleImage');
 
-$GLOBALS['BE_FFL']['metaWizardPlus']                = 'AdditionalMetafields\MetaWizardPlus';
-
-$GLOBALS['TL_MODELS']['tl_metafields']              = 'AdditionalMetafields\MetafieldsModel';
+$GLOBALS['BE_FFL']['metaWizardPlus']                = 'MetaWizardPlus';
 
 array_insert($GLOBALS['BE_MOD']['system'], 1, array(
     'metafields' => array
@@ -28,7 +26,6 @@
     )
 ));
 
-
 if (TL_MODE == 'BE') {
     $GLOBALS['TL_CSS'][] = "/system/modules/additional_metafields/assets/style.css";
 }

diff --git a/contao/config/runonce.php b/contao/config/runonce.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-use \AdditionalMetafields\MetafieldsModel;
-
 class MetafieldsRunonceJob extends \Controller {
 
     public function __construct() {

diff --git a/contao/dca/tl_settings.php b/contao/dca/tl_settings.php
diff --git a/contao/languages/de/default.php b/contao/languages/de/default.php
@@ -1,3 +1,4 @@
 <?php
 
-$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadaten', 'Metadaten-Attribute für Dateien und Ordner festlegen');
+$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadaten', 'Metadaten-Attribute für Dateien und Ordner festlegen');
+
diff --git a/contao/languages/de/tl_metafields.php b/contao/languages/de/tl_metafields.php
@@ -9,4 +9,5 @@
 
 $GLOBALS['TL_LANG']['tl_metafields']['new']          = array('Neues Attribut', 'Neues Attribut anlegen');
 $GLOBALS['TL_LANG']['tl_metafields']['edit']         = array('Attribut editieren', 'Attribut editieren');
-$GLOBALS['TL_LANG']['tl_metafields']['delete']       = array('Attribut löschen', 'Attribut löschen');
+$GLOBALS['TL_LANG']['tl_metafields']['delete']       = array('Attribut löschen', 'Attribut löschen');
+
diff --git a/contao/languages/de/tl_settings.php b/contao/languages/de/tl_settings.php
diff --git a/contao/languages/en/default.php b/contao/languages/en/default.php
@@ -1,3 +1,4 @@
 <?php
 
-$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadata', 'Set metadata attributes for files and folders');
+$GLOBALS['TL_LANG']['MOD']['metafields'] = array ('Metadata', 'Set metadata attributes for files and folders');
+
diff --git a/contao/languages/en/tl_metafields.php b/contao/languages/en/tl_metafields.php
@@ -5,3 +5,5 @@
 $GLOBALS['TL_LANG']['tl_metafields']['extensions']  = array('Extensions', 'Extensions');
 
 
+
+
diff --git a/contao/languages/en/tl_settings.php b/contao/languages/en/tl_settings.php
diff --git a/contao/models/MetafieldsModel.php b/contao/models/MetafieldsModel.php
@@ -14,11 +14,6 @@
  */
 
 
-/**
- * Run in a custom namespace, so the class can be replaced
- */
-namespace AdditionalMetafields;
-
 /**
  * Class MetafieldsModel
  *

diff --git a/contao/widgets/MetaWizardPlus.php b/contao/widgets/MetaWizardPlus.php
@@ -13,8 +13,6 @@
  * @filesource
  */
 
-namespace AdditionalMetafields;
-
 /**
  * Class MetaWizardPlus
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,8 +13,6 @@ @@
      * @filesource
      */
-    namespace AdditionalMetafields;
     /**
      * Class MetafieldsHelper
      *
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@
		$GLOBALS['TL_LANG']['tl_metafields']['extensions'] = array('Extensions', 'Extensions');