From 72bdf727ee5c1b64e902b98fe42fe91a44febd5a Mon Sep 17 00:00:00 2001 From: "laurent.duretz" Date: Mon, 29 Mar 2010 08:02:44 +0000 Subject: [PATCH] Issue 1521 : Integration of LinkRoot plugin in Piwigo core git-svn-id: http://piwigo.org/svn/trunk@5441 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/config_default.inc.php | 5 +++++ include/functions_html.inc.php | 15 ++++----------- include/section_init.inc.php | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 0ca54bc7e..19e64825c 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -335,6 +335,11 @@ $conf['insensitive_case_logon'] = false; // 'filename' $conf['uniqueness_mode'] = 'md5sum'; +// home_page : relative url of the homepage. Empty by default. +// It points to the index of the gallery. +// This parameter is used if home page is not index.php of the gallery. +$conf['home_page'] = ''; + // +-----------------------------------------------------------------------+ // | metadata | // +-----------------------------------------------------------------------+ diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 8f1753d07..440d028c7 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -40,8 +40,8 @@ function get_cat_display_name($cat_informations, { global $conf; - $output = ''; - $is_first = true; + $output = ''.l10n('Home').''; + foreach ($cat_informations as $cat) { is_array($cat) or trigger_error( @@ -54,14 +54,7 @@ function get_cat_display_name($cat_informations, 'get_cat_display_name' ); - if ($is_first) - { - $is_first = false; - } - else - { - $output.= $conf['level_separator']; - } + $output.= $conf['level_separator']; if ( !isset($url) ) { @@ -517,4 +510,4 @@ function register_default_menubar_blocks( $menu_ref_arr ) $menu->register_block( new RegisteredBlock( 'mbIdentification', 'Identification', 'piwigo') ); } -?> \ No newline at end of file +?> diff --git a/include/section_init.inc.php b/include/section_init.inc.php index a6f5fd698..10a6da258 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -237,7 +237,7 @@ if ('categories' == $page['section']) } else { - $page['title'] = l10n('Home'); + $page['title'] = ''.l10n('Home').''; } if @@ -625,4 +625,4 @@ if ( 'categories'==$page['section'] and isset($page['category']) ) } trigger_action('loc_end_section_init'); -?> \ No newline at end of file +?>