aboutsummaryrefslogtreecommitdiffstats
path: root/install.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2009-03-16 16:57:10 +0000
committerpatdenice <patdenice@piwigo.org>2009-03-16 16:57:10 +0000
commit7f8cbea1ec8a13567fa7541fbcbb096368bb8691 (patch)
treecfe4bf4a0ee68738073890b3305b68dcbc61ddbe /install.php
parent11feae676aa463eb5e74edd4a9e5ea3a2b9a94d5 (diff)
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/trunk@3203 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--install.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/install.php b/install.php
index 0836d6cf1..8bd91f5c2 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