aboutsummaryrefslogtreecommitdiffstats
path: root/picture.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-02-09 21:11:34 +0000
committerrvelices <rv-github@modusoptimus.com>2012-02-09 21:11:34 +0000
commitf6825cfb33d16796951ce29f28e2e99f61e3d903 (patch)
treea16d8fffbacb57ef35281e84410d9c7bff0cea6e /picture.php
parent40280db9d81c299044533c4331af2c2854e4f959 (diff)
- remove square/thumb from choices on picture
- fix content margin on password register - purge derivative cache by type of derivative - session saved infos/messages are not given to the page on html redirections - shorter/faster code in functions_xxx git-svn-id: http://piwigo.org/svn/trunk@13074 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--picture.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/picture.php b/picture.php
index ee96083e8..f78c6d085 100644
--- a/picture.php
+++ b/picture.php
@@ -170,6 +170,8 @@ function default_picture_content($content, $element_info)
$added = array();
foreach($element_info['derivatives'] as $type => $derivative)
{
+ if ($type==IMG_SQUARE || $type==IMG_THUMB)
+ continue;
$url = $derivative->get_url();
if (isset($added[$url]))
continue;
@@ -805,15 +807,7 @@ if (isset($picture['current']['comment'])
// author
if (!empty($picture['current']['author']))
{
- $infos['INFO_AUTHOR'] =
-// FIXME because of search engine partial rewrite, giving the author
-// name threw GET is not supported anymore. This feature should come
-// back later, with a better design
-// '<a href="'.
-// PHPWG_ROOT_PATH.'category.php?cat=search'.
-// '&amp;search=author:'.$picture['current']['author']
-// .'">'.$picture['current']['author'].'</a>';
- $picture['current']['author'];
+ $infos['INFO_AUTHOR'] = $picture['current']['author'];
}
// creation date