aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-12-09 19:20:34 +0000
committernikrou <nikrou@piwigo.org>2009-12-09 19:20:34 +0000
commit5bbe11c2d11d3b6cf5139a83fc9a5bf9b2256d72 (patch)
tree6013f4f7c52db4382231b22b31e975918296c471
parent17dd6ed3ae9fbe6c0d328adb5c0b7fad6c111474 (diff)
Bug 1314 : warning because of undefined variables in installation
git-svn-id: http://piwigo.org/svn/trunk@4454 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--install.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/install.php b/install.php
index 81f936a32..509269b88 100644
--- a/install.php
+++ b/install.php
@@ -197,7 +197,7 @@ else {
}
define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
-if ($step != 3)
+if (empty($step) || ($step != 3))
{
load_language('common.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
load_language('admin.lang', '', array('language' => $language, 'target_charset'=>'utf-8'));
@@ -227,7 +227,7 @@ if ( isset( $_POST['install'] ))
array_push( $infos, l10n('step1_confirmation') );
- $required_version = constant('REQUIRED_'.strtoupper($conf['dblayer']).'_VERSION');
+ $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
{
$pwg_charset = 'utf-8';