From e1f207136e67cb4bfd9114ebdba6a591187f408e Mon Sep 17 00:00:00 2001 From: z0rglub Date: Sat, 20 Sep 2003 21:43:39 +0000 Subject: If a category with a wrong directory name (accentuated characters) even exists (from a previous release of PhpWebGallery), a warning message is displayed but the update goes on git-svn-id: http://piwigo.org/svn/trunk@147 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/update.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'admin') diff --git a/admin/update.php b/admin/update.php index ae5e32a66..56f96e336 100644 --- a/admin/update.php +++ b/admin/update.php @@ -86,6 +86,21 @@ function insert_local_category( $cat_id ) { $output.= '"'.$file.'" : '; $output.= $lang['update_wrong_dirname'].'
'; + // if the category even exists (from a previous release of + // PhpWebGallery), we keep it in our $subdirs array + $query = 'SELECT id'; + $query.= ' FROM '.PREFIX_TABLE.'categories'; + $query.= ' WHERE site_id = '.$site_id; + $query.= " AND dir = '".$file."'"; + $query.= ' AND id_uppercat'; + if ( !is_numeric( $cat_id ) ) $query.= ' IS NULL'; + else $query.= ' = '.$cat_id; + $query.= ';'; + $result = mysql_query( $query ); + if ( mysql_num_rows( $result ) != 0 ) + { + array_push( $subdirs, $file ); + } } } } -- cgit v1.2.3