diff options
| author | gweltas <gweltas@piwigo.org> | 2004-01-15 17:06:45 +0000 |
|---|---|---|
| committer | gweltas <gweltas@piwigo.org> | 2004-01-15 17:06:45 +0000 |
| commit | 384ec739f6c11ab82f9a57e9398e954206c7a7ca (patch) | |
| tree | 0155d90946660816650d5f5f3031968cc8da6caa /template/default | |
| parent | 855398f63e4215ed16413a89f781dd2f6cffa231 (diff) | |
Correction of php warnings
git-svn-id: http://piwigo.org/svn/branches/release-1_3@280 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template/default')
| -rw-r--r-- | template/default/htmlfunctions.inc.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/template/default/htmlfunctions.inc.php b/template/default/htmlfunctions.inc.php index aade6e2e5..c3b2872b7 100644 --- a/template/default/htmlfunctions.inc.php +++ b/template/default/htmlfunctions.inc.php @@ -177,7 +177,6 @@ function display_category( $category, $indent, $handle ) $vtp->addSession( $handle, 'category' ); $vtp->setVar( $handle, 'category.indent', $indent ); - if ( $user['expand'] or $category['nb_sub_categories'] == 0 ) { $vtp->addSession( $handle, 'bullet_wo_link' ); @@ -193,10 +192,10 @@ function display_category( $category, $indent, $handle ) { $url .='?cat='.$page['cat']; $url.= '&expand='.$category['expand_string']; - if ( $page['cat'] == 'search' ) - { - $url.= '&search='.$_GET['search'].'&mode='.$_GET['mode']; - } + } + else if ($category['expand_string']<>'') + { + $url.= '?expand='.$category['expand_string']; } $vtp->setVar( $handle, 'bullet_w_link.bullet_link', add_session_id($url) ); if ( $category['expanded'] ) |