From: Roland Haeder <roland@mxchange.org>
Date: Thu, 17 Apr 2014 22:18:59 +0000 (+0200)
Subject: Added missing 'extension' initialization in installer and used EL code there + fixed... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=654f549c9b33a10285c98d17acdd2de73c26462a;p=mailer.git

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

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 450f1787e9..337e8df68d 100644
--- 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 cf5a1489cf..b76716d062 100644
--- 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 4b638b0658..fdf5c253d6 100644
--- 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>