merge -r 2303 from branch-1_7 to trunk

- removed some unused code
- mass_updates function does not need SELECT VERSION() 
- rewrote update_uppercats to avoid db update if no change

git-svn-id: http://piwigo.org/svn/trunk@2304 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2008-04-19 03:00:11 +00:00
parent e57f06df4a
commit 55095f9ce9
2 changed files with 26 additions and 74 deletions
+2 -9
View File
@@ -188,11 +188,6 @@ SELECT tag_id
;';
$selected_tags = array_from_query($query, 'tag_id');
// Navigation path
$date = isset($_POST['date_creation']) && empty($page['errors'])
?$_POST['date_creation']:date_convert_back(@$row['date_creation']);
// +-----------------------------------------------------------------------+
// | template init |
// +-----------------------------------------------------------------------+
@@ -224,7 +219,7 @@ else
$template->assign(
array(
'U_SYNC' =>
PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
get_root_url().'admin.php?page=picture_modify'.
'&image_id='.$_GET['image_id'].
(isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : '').
'&sync_metadata=1',
@@ -246,8 +241,6 @@ $template->assign(
'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],
'CREATION_DATE' => $date,
'TAG_SELECTION' => $tag_selection,
'DESCRIPTION' =>
@@ -255,7 +248,7 @@ $template->assign(
stripslashes($_POST['description']) : @$row['comment'] ),
'F_ACTION' =>
PHPWG_ROOT_PATH.'admin.php'
get_root_url().'admin.php'
.get_query_string_diff(array('sync_metadata'))
)
);