From 384ec739f6c11ab82f9a57e9398e954206c7a7ca Mon Sep 17 00:00:00 2001
From: gweltas <gweltas@piwigo.org>
Date: Thu, 15 Jan 2004 17:06:45 +0000
Subject: Correction of php warnings

git-svn-id: http://piwigo.org/svn/branches/release-1_3@280 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/default/htmlfunctions.inc.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'template/default/htmlfunctions.inc.php')

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.= '&amp;expand='.$category['expand_string'];
-    if ( $page['cat'] == 'search' )
-    {
-      $url.= '&amp;search='.$_GET['search'].'&amp;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'] )
-- 
cgit v1.2.3