Forgot it to comment out ... :(

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 2375cd5f526e866f8137dc8f45b88563dd6d4102..1e00d24106bfda972a3380fb0a3ae5fc5b64b7dc 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -46,8 +46,10 @@ loadExtension('timezone', 'test');
 // Set config entry
 setConfigEntry('timezone', 'Europe/Berlin');
 
-// And init timezone
+// Init some things
 FILTER_INIT_TIMEZONE(array());
+FILTER_INIT_RANDOMIZER();
+FILTER_INIT_RANDOM_NUMBER();
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
@@ -87,7 +89,7 @@ if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page'
 // Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Construct include file name
-       $inc = 'inc/install/install_page_' . getRequestElement('install_page');
+       $inc = 'inc/install/install_page_' . getRequestElement('install_page') . '.php';
 
        // Is the include file there?
        if (isIncludeReadable($inc)) {
@@ -96,7 +98,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
        } else {
                // Not found, may be invalid page
                logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_page')));
-               addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
+               addTemplateToInstallContent('admin_settings_unsaved', '{%message,INSTALLER_WRONG_PAGE=' . getRequestElement('install_page') . '%}');
        }
 } else {
        // Already installed!