Added missing 'extension' initialization in installer and used EL code there + fixed...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/install/install_page_2.php b/inc/install/install_page_2.php
index 450f1787e97070c634dd31d16c0be1e9b60e81a6..337e8df68d0280aa325a3e736476ee1d104175ed 100644 (file)
--- a/inc/install/install_page_2.php
+++ b/inc/install/install_page_2.php
@@ -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()) {

diff --git a/templates/de/html/ext/ext_uberwach.tpl b/templates/de/html/ext/ext_uberwach.tpl
index cf5a1489cf4edbf70a1d7e02eee9e7fb7bf1b1b8..b76716d06224b82b0f0c52ca40cb8978214b655e 100644 (file)
--- a/templates/de/html/ext/ext_uberwach.tpl
+++ b/templates/de/html/ext/ext_uberwach.tpl
@@ -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">

diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl
index 4b638b06582d052bd29af9ad2e0c25d51e3d9717..fdf5c253d6e227ff8a4503adc1fdb66c445e8df3 100644 (file)
--- a/templates/de/html/install/install_page2.tpl
+++ b/templates/de/html/install/install_page2.tpl
@@ -45,11 +45,11 @@
        </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>