diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-03-22 01:01:47 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-03-22 01:01:47 +0000 |
| commit | 0971ce48d217b7cc8081ae70c4b041ab23fdf29c (patch) | |
| tree | 841bd14e9c2a19c207fb8479b1a086112795d04a /include/picture_metadata.inc.php | |
| parent | 3609c224c74f50a9049524ebedc996ddd1187108 (diff) | |
URL rewriting: capable of fully working with urls without ?
URL rewriting: works with image file instead of image id (change
make_picture_url to generate urls with file name instead of image id)
URL rewriting: completely works with category/best_rated and
picture/best_rated/534 (change 'category.php?' to 'category' in make_index_url
and 'picture.php?' to 'picture' in make_picture_url to see it)
fix: picture category display in upper bar
fix: function rate_picture variables and use of the new user type
fix: caddie icon appears now on category page
fix: admin element_set sql query was using storage_category_id column
(column has moved to #image_categories)
fix: replaced some old $_GET[xxx] with $page[xxx]
fix: pictures have metadata url (use ? parameter - might change later)
git-svn-id: http://piwigo.org/svn/trunk@1092 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/picture_metadata.inc.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index de910ad07..508ed3a67 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -6,9 +6,9 @@ // +-----------------------------------------------------------------------+ // | branch : BSF (Best So Far) // | file : $RCSfile$ -// | last update : $Date: 2006-03-09 00:14:53 +0100 (jeu, 09 mar 2006) $ -// | last modifier : $Author: rub $ -// | revision : $Revision: 1070 $ +// | last update : $Date$ +// | last modifier : $Author$ +// | revision : $Revision$ // +-----------------------------------------------------------------------+ // | This program is free software; you can redistribute it and/or modify | // | it under the terms of the GNU General Public License as published by | @@ -27,10 +27,10 @@ /** * This file is included by the picture page to manage picture metadata - * + * */ -if ($metadata_showable and isset($_GET['show_metadata'])) +if ($metadata_showable and isset($_GET['metadata'])) { include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); $template->assign_block_vars('metadata', array()); @@ -41,7 +41,7 @@ if ($metadata_showable and isset($_GET['show_metadata'])) die('Exif extension not available, admin should disable exif display'); } - if ($exif = @read_exif_data($picture['current']['src'])) + if ($exif = @read_exif_data($picture['current']['src_file_system'])) { $template->assign_block_vars( 'metadata.headline', |