diff options
| author | patdenice <patdenice@piwigo.org> | 2009-03-16 17:04:13 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-03-16 17:04:13 +0000 |
| commit | 796cbc835020db800660443a31d617855d3f7640 (patch) | |
| tree | 69c52cee8712200751521cb1256e11499a1dae49 /install.php | |
| parent | bbc19a5dc92468f02de74a254f7f4defc68c146a (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-- | install.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/install.php b/install.php index ec222db7d..ad41acc4c 100644 --- a/install.php +++ b/install.php @@ -21,12 +21,6 @@ // | USA. | // +-----------------------------------------------------------------------+ -//------------------------------------------------- check php version -if (version_compare(PHP_VERSION, '5', '<')) -{ - die('Piwigo requires PHP 5 or above.'); -} - //----------------------------------------------------------- include define('PHPWG_ROOT_PATH','./'); @@ -223,7 +217,14 @@ load_language( 'common.lang', '', array('language'=>$language, 'target_charset'= load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); load_language( 'install.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') ); +//------------------------------------------------- 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('install'=>'install.tpl') ); $step = 1; @@ -430,4 +431,4 @@ if (count($infos) != 0 ) //----------------------------------------------------------- html code display $template->pparse('install'); -?> +?>
\ No newline at end of file |