1 files changed, 14 insertions, 12 deletions

diff --git a/category.php b/category.php
index 07d15a95c..e466a5bb2 100644
--- a/category.php
+++ b/category.php
@@ -85,21 +85,22 @@ if ( isset($page['cat_nb_images'])
   if ( isset($page['cat']) )
   {
     $nav_url .= 'cat='.$page['cat'].'&';
-  }
 
-  switch ($page['cat'])
-  {
-    case 'search':
+    switch ($page['cat'])
     {
-      $nav_url.= 'search='.$_GET['search'].'&';
-      break;
-    }
-    case 'list':
-    {
-      $nav_url.= 'list='.$_GET['list'].'&';
-      break;
+      case 'search':
+      {
+        $nav_url.= 'search='.$_GET['search'].'&';
+        break;
+      }
+      case 'list':
+      {
+        $nav_url.= 'list='.$_GET['list'].'&';
+        break;
+      }
     }
   }
+
   if ( isset($_GET['calendar']) )
   {
     $nav_url.= 'calendar='.$_GET['calendar'];
@@ -401,7 +402,8 @@ if ( $page['navigation_bar'] != '' )
     );
 }
 
-if ($page['cat_nb_images']>0 and 
+if ( ( isset($page['cat_nb_images']) and $page['cat_nb_images']>0 ) 
+     and 
     ( !isset($page['cat']) 
       or ($page['cat'] != 'most_visited' and $page['cat'] != 'best_rated') )
    )