diff options
author | rvelices <rv-github@modusoptimus.com> | 2012-10-13 15:55:35 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2012-10-13 15:55:35 +0000 |
commit | 7f75c131ed12fe830a13cc77ae677aa0d68740a4 (patch) | |
tree | e3a9158d12ad57ae60c4f82ed58320d82d410313 /include | |
parent | 1e6e762643273efd9cf012e68006fa57ee1b22a3 (diff) |
bug 2772: remove "Home" from html title pages on index pages
git-svn-id: http://piwigo.org/svn/trunk@18637 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | include/config_default.inc.php | 4 | ||||
-rw-r--r-- | include/page_header.php | 4 | ||||
-rw-r--r-- | include/section_init.inc.php | 17 |
3 files changed, 15 insertions, 10 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 073b97cc3..121221c2d 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -182,10 +182,6 @@ $conf['links'] = array(); // ); $conf['random_index_redirect'] = array(); -// reverse_home_title: if Piwigo is your home page for a better robot index -// we recommend to set it true (Only index page will reverse its title) -$conf['reverse_home_title'] = false; - // List of notes to display on all header page // example $conf['header_notes'] = array('Test', 'Hello'); $conf['header_notes'] = array(); diff --git a/include/page_header.php b/include/page_header.php index 69e17e771..1decff0f0 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -48,10 +48,6 @@ $template->assign( isset($page['body_id']) ? $page['body_id'] : '', - 'REVERSE' => - (isset($conf['reverse_home_title']) and $conf['reverse_home_title']) ? - true : false, - 'CONTENT_ENCODING' => get_pwg_charset(), 'PAGE_TITLE' => strip_tags($title), diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 138b16cec..4a55cf732 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -561,9 +561,22 @@ if (isset($page['title'])) { if (!empty($page['title'])) { - $page['title'] = $conf['level_separator'].$page['title']; + $page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['title']; } - $page['title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$page['title']; + else + { + if ('picture'==script_basename()) + { + $used_title = l10n('Home'); + $used_link = duplicate_index_url(array('start'=>0)); + } + else + { + $used_title = @$page['is_homepage'] ? $conf['gallery_title'] :l10n('Home'); + $used_link = get_gallery_home_url(); + } + $page['section_title'] = $page['title'] = '<a href="'.$used_link.'">'.$used_title.'</a>'; + } } // add meta robots noindex, nofollow to avoid unnecesary robot crawls |