diff options
Diffstat (limited to 'include/section_init.inc.php')
| -rw-r--r-- | include/section_init.inc.php | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 9b6e4b088..61d8bf5e3 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -339,7 +339,7 @@ else $page['tag_ids'] = array(); foreach ($page['tags'] as $tag) { - array_push($page['tag_ids'], $tag['id']); + $page['tag_ids'][] = $tag['id']; } $items = get_image_ids_for_tags($page['tag_ids']); @@ -452,10 +452,10 @@ SELECT image_id SELECT DISTINCT(id) FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id - WHERE - date_available >= '.pwg_db_get_recent_period_expression($user['recent_period']).' - '.$forbidden.' - '.$conf['order_by'].' + WHERE ' + .get_recent_photos_sql('date_available').' + '.$forbidden + .$conf['order_by'].' ;'; $page = array_merge( @@ -570,21 +570,14 @@ if (isset($page['chronology_field'])) // title update if (isset($page['title'])) { + $page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'; if (!empty($page['title'])) - { - $page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['title']; - } + { + $page['section_title'] .= $conf['level_separator'].$page['title']; + } else { - if ('picture'==script_basename()) - { - $used_link = duplicate_index_url(array('start'=>0)); - } - else - { - $used_link = get_gallery_home_url(); - } - $page['section_title'] = $page['title'] = '<a href="'.$used_link.'">'.l10n('Home').'</a>'; + $page['title'] = $page['section_title']; } } |