Fixed #12343: Installer - Missing message when creation of admin user fails due to...
authorBenni Mack <benni.mack@typo3.org>
Sun, 21 Feb 2010 16:55:55 +0000 (16:55 +0000)
committerBenni Mack <benni.mack@typo3.org>
Sun, 21 Feb 2010 16:55:55 +0000 (16:55 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6945 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index a22c655..25ba6d0 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-02-21  Benjamin Mack  <benni@typo3.org>
 
+       * Fixed #12343: Installer - Missing message when creation of admin user fails due to missing data (Thanks to Marcus Krause)
        * Fixed #13423: Bug/Feature: Make ext_tables.sql syntax parsing more compliable (Thanks to Joachim Mathes)
        * Fixed #13201: Repots module - Use same install tool check for reports as used in About module (Thanks to Moreno Feltscher)
 
index d814776..2c6f67a 100755 (executable)
@@ -3856,9 +3856,10 @@ From sub-directory:
                                        if ($whichTables['be_users'])   {
                                                if (is_array($this->INSTALL['database_adminUser']))     {
                                                        $username = preg_replace('/[^\da-z._-]/i', '', trim($this->INSTALL['database_adminUser']['username']));
-                                                       $pass = trim($this->INSTALL['database_adminUser']['password2']);
-                                                       if ($username && $pass) {
-                                                               if ($pass != trim($this->INSTALL['database_adminUser']['password'])) {
+                                                       $pass = trim($this->INSTALL['database_adminUser']['password']);
+                                                       $pass2 = trim($this->INSTALL['database_adminUser']['password2']);
+                                                       if ($username && $pass && $pass2)       {
+                                                               if ($pass != $pass2) {
                                                                        $this->message($headCode, 'Passwords are not equal!', '
                                                                                The passwords entered twice are not equal.',2,1);
                                                                } else {
@@ -3893,6 +3894,9 @@ From sub-directory:
                                                                        The username, <strong>'.htmlspecialchars($username).'</strong>, was not unique.',2,1);
                                                                }
                                                        }
+                                               } else {
+                                                       $this->message($headCode,'Missing data!','
+                                                               Not all required form fields have been filled.',2,1);
                                                }
                                                }
                                                $content = '