From ade00c95c26eefbd60b5f9f3efc2f848a196cf3e Mon Sep 17 00:00:00 2001 From: rub Date: Fri, 10 Mar 2006 20:17:18 +0000 Subject: Step 4 improvement issue 0000301: o Correction lock categories and is_admin (functions with parameters now) o Cannot use check_status with upgrade.php and upgrade_feed.php => New function check_upgrade use in upgrade*.php (new functionality for upgrade_feed.php) o upgrade_feed.php is showed only for administrator user git-svn-id: http://piwigo.org/svn/trunk@1075 68402e56-0260-453c-a942-63ccdbb3a9ee --- upgrade.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'upgrade.php') diff --git a/upgrade.php b/upgrade.php index 89e42ce18..8871ebc88 100644 --- a/upgrade.php +++ b/upgrade.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | branch : BSF (Best So Far) // | file : $RCSfile$ @@ -32,17 +32,11 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include(PHPWG_ROOT_PATH.'include/template.php'); include(PHPWG_ROOT_PATH.'include/mysql.inc.php'); -// Is PhpWebGallery already installed ? -if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE) -{ - $message = 'PhpWebGallery is not in upgrade mode. In include/mysql.inc.php, -insert line -
-define(\'PHPWG_IN_UPGRADE\', true);
-
-if you want to upgrade'; - die($message); -} + +// +-----------------------------------------------------------------------+ +// | Check Access and exit when it is not ok | +// +-----------------------------------------------------------------------+ +check_upgrade(); // concerning upgrade, we use the default users table $conf['users_table'] = $prefixeTable.'users'; -- cgit v1.2.3