aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
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--include/common.inc.php1
-rw-r--r--include/functions.inc.php1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 1ca54e1bb..2cd761f9c 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -101,6 +101,7 @@ if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))
include(PHPWG_ROOT_PATH . 'include/constants.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
+include( PHPWG_ROOT_PATH .'include/template.class.php');
// Database connection
@mysql_connect( $cfgHote, $cfgUser, $cfgPassword ) or my_error( 'mysql_connect', true );
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 83c9980de..273d63776 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -30,7 +30,6 @@ include_once( PHPWG_ROOT_PATH .'include/functions_html.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
-include_once( PHPWG_ROOT_PATH .'include/template.class.php');
//----------------------------------------------------------- generic functions