From 84f973ce269382e83071345d4e765381a5ee2ada Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 2 Dec 2013 20:39:15 +0100 Subject: [PATCH] fix html-tag in preconfig, fix missing global in database-class, change description of password-reset-setting accordingly to new activation-link-procedure Signed-off-by: Michael Kaufmann (d00p) --- install/updates/preconfig/0.9/preconfig_0.9.inc.php | 2 +- lib/classes/database/class.Database.php | 2 +- lng/english.lng.php | 4 ++-- lng/german.lng.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index d06d3599..69896f3a 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -594,7 +594,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) if (versionInUpdate($current_version, '0.9.31-dev5')) { $has_preconfig = true; - $description = 'You can enbable/disable error-reporting for admins and customers!
br />'; + $description = 'You can enbable/disable error-reporting for admins and customers!

'; $question = 'Do you want to enable error-reporting for admins? (default: yes): '; $question.= makeyesno('update_error_report_admin', '1', '0', '1').'
'; $question.= 'Do you want to enable error-reporting for customers? (default: no): '; diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php index bdd8d755..a5362883 100644 --- a/lib/classes/database/class.Database.php +++ b/lib/classes/database/class.Database.php @@ -294,7 +294,7 @@ class Database { * @param bool $showerror if set to false, the error will be logged but we go on */ private static function _showerror($error, $showerror = true) { - global $userinfo, $theme, $linker; + global $userinfo, $settings, $theme, $linker; /** * log to a file, so we can actually ask people for the error diff --git a/lng/english.lng.php b/lng/english.lng.php index 962644f3..fac8d063 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -883,9 +883,9 @@ $lng['domains']['topleveldomain'] = 'Top-Level-Domain'; // ADDED IN 1.2.19-svn22 -$lng['serversettings']['allow_password_reset']['description'] = 'Customers can reset their password and a new password will be sent to their e-mail address'; +$lng['serversettings']['allow_password_reset']['description'] = 'Customers can reset their password and an activation link will be sent to their e-mail address'; $lng['serversettings']['allow_password_reset_admin']['title'] = 'Allow password reset by admins'; -$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/reseller can reset their password and a new password will be sent to their e-mail address'; +$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/reseller can reset their password and an activation link will be sent to their e-mail address'; // ADDED IN 1.2.19-svn25 diff --git a/lng/german.lng.php b/lng/german.lng.php index 126263a9..9e452700 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -882,9 +882,9 @@ $lng['domains']['topleveldomain'] = 'Top-Level-Domain'; // ADDED IN 1.2.19-svn22 -$lng['serversettings']['allow_password_reset']['description'] = 'Kunden können ihr Passwort zurücksetzen und bekommen ein Neues per E-Mail zugesandt'; +$lng['serversettings']['allow_password_reset']['description'] = 'Kunden können ihr Passwort zurücksetzen und bekommen einen Aktivierungs-Link per E-Mail zugesandt'; $lng['serversettings']['allow_password_reset_admin']['title'] = 'Erlaube das Zurücksetzen von Admin-/Reseller-Passwörtern.'; -$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/Reseller können ihr Passwort zurücksetzen und bekommen ein Neues per E-Mail zugesandt'; +$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/Reseller können ihr Passwort zurücksetzen und bekommen einen Aktivierungs-Link per E-Mail zugesandt'; // ADDED IN 1.2.19-svn25 // Mailquota