diff options
| author | rub <rub@piwigo.org> | 2007-06-21 21:00:09 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-06-21 21:00:09 +0000 |
| commit | 97703aa9deebdb6d7e9c3bed2917e78dd39d7be0 (patch) | |
| tree | c4da134869c46b7e18205585a155ed8c83f73b4f /admin | |
| parent | 58dc3aa595dd7630836646e7d52220a973d43e93 (diff) | |
Resolved issue 0000708: Error on synchronization
Resolved issue 0000709: Error with $conf['default_admin_layout']
Merge BSF 2037:2039 into branch-1_7
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2040 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/site_update.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/admin/site_update.php b/admin/site_update.php index 96d4e78b9..7e83d62fb 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -4,8 +4,7 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -127,15 +126,20 @@ if (isset($_POST['submit'])) // | directories / categories | // +-----------------------------------------------------------------------+ if (isset($_POST['submit']) - and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files') - and !$general_failure) + and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files')) { $counts['new_categories'] = 0; $counts['del_categories'] = 0; $counts['del_elements'] = 0; $counts['new_elements'] = 0; $counts['upd_elements'] = 0; +} + +if (isset($_POST['submit']) + and ($_POST['sync'] == 'dirs' or $_POST['sync'] == 'files') + and !$general_failure) +{ $start = get_moment(); // which categories to update ? $cat_ids = array(); |