aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/category_default.inc.php6
-rw-r--r--include/config_default.inc.php4
2 files changed, 2 insertions, 8 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 454d1e1e5..444ffd826 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -37,7 +37,7 @@ $selection = array_slice(
if (count($selection) > 0)
{
- $rank_of = array_flip($page['items']);
+ $rank_of = array_flip($selection);
$query = '
SELECT *
@@ -48,8 +48,7 @@ SELECT *
while ($row = pwg_db_fetch_assoc($result))
{
$row['rank'] = $rank_of[ $row['id'] ];
-
- array_push($pictures, $row);
+ $pictures[] = $row;
}
usort($pictures, 'rank_compare');
@@ -113,7 +112,6 @@ foreach ($pictures as $row)
$desc = render_element_description($row);
$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),
'URL' => $url,
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index dad6e9b20..d09ebf302 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -193,10 +193,6 @@ $conf['header_notes'] = array();
// 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
// category.
$conf['display_fromto'] = false;