Followup to #7501: Removed check for static templates from installer
authorBenni Mack <benni.mack@typo3.org>
Sat, 1 May 2010 18:12:09 +0000 (18:12 +0000)
committerBenni Mack <benni.mack@typo3.org>
Sat, 1 May 2010 18:12:09 +0000 (18:12 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7491 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/install/mod/class.tx_install.php

index e2e26f9..67bb0a1 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Benjamin Mack  <benni@typo3.org>
+
+       * Followup to #7501: Removed check for static templates from installer
+
 2010-05-01 Francois Suter  <francois@typo3.org>
 
        * Follow-up to #14195: removed file typo3/sysext/t3skin/stylesheets/.htaccess which has become useless
index 2cc83d2..16a4975 100755 (executable)
  * 3873:     function updateWizard_parts($action)
  * 3987:     function getUpgradeObjInstance($className, $identifier)
  * 4000:     function isBackendAdminUser()
- * 4011:     function isStaticTemplates()
  * 4023:     function isBasicComplete($tLabel)
  * 4063:     function generateUpdateDatabaseForm($type, $arr_update, $arr_remove, $action_type)
  * 4094:     function getUpdateDbFormWrap($action_type, $content, $label='Write to database')
@@ -6807,15 +6806,6 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
        }
 
        /**
-        * Check if static templates are available in database
-        *
-        * @return integer Amount of static templates in the database
-        */
-       function isStaticTemplates() {
-               return $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('uid', 'static_template');
-       }
-
-       /**
         * Check if the basic settings are complete
         * Only used by 1-2-3 mode
         *
@@ -6828,9 +6818,8 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
 
                        if (count($tables)) {
                                $beuser = $this->isBackendAdminUser();
-                               $static = $this->isStaticTemplates();
                        }
-                       if (count($tables) && $beuser && $static) {
+                       if (count($tables) && $beuser) {
                                $mode123Imported=1;
                                $this->message($tLabel, 'Basic Installation Completed', $this->messageBasicFinished(), -1, 1);
                                $this->message($tLabel,'Security Risk!',$this->securityRisk().$this->alterPasswordForm(),2,1);
@@ -6840,8 +6829,6 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
 
                                '.(count($tables)?'':'- You haven\'t imported any tables yet.
                                ')
-                               .($static?'':'- You haven\'t imported the static_template table.
-                               ')
                                .($beuser?'':'- You haven\'t created an admin-user yet.
                                ')
                                .'