Merge branch 'master' into develop

Change-Id: Id22a1d4634d27ed841d9abfc4b5a78e0633f33a2
kartolo · Mar 14, 2017 · 7b7bdf6 · 7b7bdf6
2 parents 7e3a603 + 576d158
commit 7b7bdf6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/Configuration/TCA/Overrides/tt_address.php b/Configuration/TCA/Overrides/tt_address.php
@@ -3,4 +3,4 @@
     die('Access denied.');
 }
 
-$GLOBALS['TCA']['tt_address']['feInterface']['fe_admin_fieldList'] .= ',name';
+$GLOBALS['TCA']['tt_address']['feInterface']['fe_admin_fieldList'] .= ',hidden,gender,name,email,first_name,last_name,company';
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -42,5 +42,10 @@
         'suggests' => array(
         ),
     ),
+    'autoload' => array(
+      'classmap' => array(
+        'pi/class.dmailsubscribe.php',
+      )
+    ),
     '_md5_values_when_last_written' => 'a:13:{s:9:"ChangeLog";s:4:"2578";s:12:"ext_icon.gif";s:4:"8d58";s:14:"ext_tables.php";s:4:"8517";s:14:"ext_tables.sql";s:4:"1e8e";s:15:"fe_adminLib.inc";s:4:"715e";s:13:"locallang.php";s:4:"1ab3";s:16:"locallang_db.xml";s:4:"f6d4";s:10:"README.txt";s:4:"e4af";s:27:"pi/class.dmailsubscribe.php";s:4:"44f7";s:30:"pi/fe_admin_dmailsubscrip.tmpl";s:4:"a4dd";s:16:"pi/locallang.xml";s:4:"c842";s:20:"static/constants.txt";s:4:"3daf";s:16:"static/setup.txt";s:4:"e9a2";}',
 );
diff --git a/pi/class.dmailsubscribe.php b/pi/class.dmailsubscribe.php
@@ -70,7 +70,7 @@ class user_dmailsubscribe
     /**
      * Constructor.
      */
-    public function user_dmailsubscribe()
+    public function __construct()
     {
         $this->cObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer');
         $this->conf = $GLOBALS['TSFE']->tmpl->setup['plugin.']['feadmin.']['dmailsubscription.'];
@@ -87,6 +87,14 @@ public function user_dmailsubscribe()
         $this->pi_loadLL();
     }
 
+    /**
+     * keep old constructor for backwards compatibility
+     */
+    public function user_dmailsubscribe()
+    {
+        self::__construct();
+	}
+
     /**
      * Userfunc called per TS to create categories check boxes.
      *