Changeset 3204 for branches/2.0/install.php

Timestamp:

Mar 16, 2009, 6:04:13 PM (16 years ago)

Author:

patdenice

Message:

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.

File:

• branches/2.0/install.php (modified) (2 diffs)

branches/2.0/install.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
-//------------------------------------------------- check php version
-if (version_compare(PHP_VERSION, '5', '<'))
-{
-  die('Piwigo requires PHP 5 or above.');
-}
-
 //----------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
@@ -224 +218 @@
 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') );