Added missing 'extension' initialization in installer and used EL code there + fixed...
authorRoland Haeder <roland@mxchange.org>
Thu, 17 Apr 2014 22:18:59 +0000 (00:18 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 17 Apr 2014 22:18:59 +0000 (00:18 +0200)
Signed-off-by: Roland H├Ąder <roland@mxchange.org>
inc/install/install_page_2.php
templates/de/html/ext/ext_uberwach.tpl
templates/de/html/install/install_page2.tpl

index 450f178..337e8df 100644 (file)
@@ -41,11 +41,12 @@ if ((!defined('__SECURITY')) || (!isInstaller())) {
 } // END - if
 
 // Prepare emissing elements
-if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
-if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
-if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
-if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
-if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
+if (empty($GLOBALS['install_mysql']['dbase']))     $GLOBALS['install_mysql']['dbase']     = 'your_database';
+if (empty($GLOBALS['install_mysql']['login']))     $GLOBALS['install_mysql']['login']     = 'your_login';
+if (empty($GLOBALS['install_mysql']['host']))      $GLOBALS['install_mysql']['host']      = 'localhost';
+if (empty($GLOBALS['install_mysql']['prefix']))    $GLOBALS['install_mysql']['prefix']    = 'mailer';
+if (empty($GLOBALS['install_mysql']['type']))      $GLOBALS['install_mysql']['type']      = 'MyISAM';
+if (empty($GLOBALS['install_mysql']['extension'])) $GLOBALS['install_mysql']['extension'] = 'mysqli';
 
 // Are there errors?
 if (ifFatalErrorsDetected()) {
index cf5a148..b76716d 100644 (file)
@@ -4,7 +4,7 @@
 
 <div class="para">
 Die gro&szlig;e Koalition aus CDU &amp; SPD will Deutschland in Zeiten des
-internationalen Terrors zu einem sicheren Land f&Uuml;r uns alle machen.
+internationalen Terrors zu einem sicheren Land f&uuml;r uns alle machen.
 </div>
 
 <div class="para">
index 4b638b0..fdf5c25 100644 (file)
        </tr>
 
        <tr>
-               <td align="right" class="install_right">{--INSTALLER_MYSQL_EXTENSION--}</td>
+               <td align="right" class="install_right">{--INSTALLER_DATABASE_EXTENSION--}</td>
                <td align="left">
                        <select name="mysql[extension]" size="1">
-                               <option value="mysql">{--INSTALLER_DATABASE_EXTENSION_MYSQL--}</option>
-                               <option value="mysqli">{--INSTALLER_DATABASE_EXTENSION_MYSQLI--}</option>
+                               <option value="mysql">{%pipe,translatePhpExtension=mysql%}</option>
+                               <option value="mysqli" selected="selected">{%pipe,translatePhpExtension=mysqli%}</option>
                        </select>
                </td>
        </tr>