Index: /trunk/admin/include/image.class.php =================================================================== --- /trunk/admin/include/image.class.php (revision 13114) +++ /trunk/admin/include/image.class.php (revision 13115) @@ -266,6 +266,6 @@ static function get_sharpen_matrix($amount) { - // Amount should be in the range of 18-10 - $amount = round(abs(-18 + ($amount * 0.08)), 2); + // Amount should be in the range of 24-10 + $amount = round(abs(-24 + ($amount * 0.14)), 2); $matrix = array Index: /trunk/include/category_default.inc.php =================================================================== --- /trunk/include/category_default.inc.php (revision 13114) +++ /trunk/include/category_default.inc.php (revision 13115) @@ -38,5 +38,5 @@ if (count($selection) > 0) { - $rank_of = array_flip($page['items']); + $rank_of = array_flip($selection); $query = ' @@ -49,6 +49,5 @@ { $row['rank'] = $rank_of[ $row['id'] ]; - - array_push($pictures, $row); + $pictures[] = $row; } @@ -114,5 +113,4 @@ $tpl_var = array_merge( $row, array( - 'TN_SRC' => DerivativeImage::thumb_url($row), 'TN_ALT' => htmlspecialchars(strip_tags($name)), 'TN_TITLE' => get_thumbnail_title($row, $name, $desc), Index: /trunk/include/config_default.inc.php =================================================================== --- /trunk/include/config_default.inc.php (revision 13114) +++ /trunk/include/config_default.inc.php (revision 13115) @@ -193,8 +193,4 @@ // show_thumbnail_caption : on thumbnails page, show thumbnail captions ? $conf['show_thumbnail_caption'] = true; - -// show_picture_name_on_title : on picture presentation page, show picture -// name ? -$conf['show_picture_name_on_title'] = true; // display_fromto: display the date creation bounds of a Index: /trunk/picture.php =================================================================== --- /trunk/picture.php (revision 13114) +++ /trunk/picture.php (revision 13115) @@ -718,5 +718,4 @@ 'SECTION_TITLE' => $page['title'], 'PHOTO' => $title_nb, - 'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'], 'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ), Index: /trunk/template-extension/distributed/samples/my-picture.tpl =================================================================== --- /trunk/template-extension/distributed/samples/my-picture.tpl (revision 13114) +++ /trunk/template-extension/distributed/samples/my-picture.tpl (revision 13115) @@ -27,7 +27,5 @@