aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2009-03-16 17:04:13 +0000
committerpatdenice <patdenice@piwigo.org>2009-03-16 17:04:13 +0000
commit796cbc835020db800660443a31d617855d3f7640 (patch)
tree69c52cee8712200751521cb1256e11499a1dae49 /upgrade.php
parentbbc19a5dc92468f02de74a254f7f4defc68c146a (diff)
merge r3203 from trunk to branch 2.0.
Move template class inclusion to common.inc.php. Add forum link in upgrade page. Install and upgrade try to configure PHP5. git-svn-id: http://piwigo.org/svn/branches/2.0@3204 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--upgrade.php28
1 files changed, 21 insertions, 7 deletions
diff --git a/upgrade.php b/upgrade.php
index f2c2cb195..fff0a5ff5 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -21,12 +21,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
-//check php version
-if (version_compare(PHP_VERSION, '5', '<'))
-{
- die('Piwigo requires PHP 5 or above.');
-}
-
define('PHPWG_ROOT_PATH', './');
// load config file
@@ -167,17 +161,37 @@ else
}
}
+if ('fr_FR' == $language) {
+ define('PHPWG_DOMAIN', 'fr.piwigo.org');
+}
+else {
+ define('PHPWG_DOMAIN', 'piwigo.org');
+}
+define('PHPWG_URL', 'http://'.PHPWG_DOMAIN);
+
load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
+load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8', 'no_fallback' => true) );
+// check php version
+if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<'))
+{
+ include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php');
+}
+
// +-----------------------------------------------------------------------+
// | template initialization |
// +-----------------------------------------------------------------------+
+include( PHPWG_ROOT_PATH .'include/template.class.php');
$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
$template->set_filenames(array('upgrade'=>'upgrade.tpl'));
-$template->assign('RELEASE', PHPWG_VERSION);
+$template->assign(array(
+ 'RELEASE' => PHPWG_VERSION,
+ 'L_UPGRADE_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
+ )
+);
// +-----------------------------------------------------------------------+
// | upgrade choice |