aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlaurent.duretz <laurent.duretz@piwigo.org>2010-03-29 08:02:44 +0000
committerlaurent.duretz <laurent.duretz@piwigo.org>2010-03-29 08:02:44 +0000
commit72bdf727ee5c1b64e902b98fe42fe91a44febd5a (patch)
tree71490901cd9dff8b4561ac71242015fe5ae3712b
parent36a4b9aff5c3c4e9418b1f9286497056cd7196f3 (diff)
Issue 1521 : Integration of LinkRoot plugin in Piwigo core
git-svn-id: http://piwigo.org/svn/trunk@5441 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/config_default.inc.php5
-rw-r--r--include/functions_html.inc.php15
-rw-r--r--include/section_init.inc.php4
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 = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('Home').'</a>';
+
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'] = '<a href="'.PHPWG_ROOT_PATH.$conf['home_page'].'">'.l10n('Home').'</a>';
}
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
+?>