adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000708: Error on synchronization

Browse Source 
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
This commit is contained in:
rub
2007-06-21 21:00:09 +00:00
parent 58dc3aa595
commit 97703aa9de
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/site_update.php
+8 -4
View File
@@ -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();