1 files changed, 16 insertions, 13 deletions

diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 558e3d389..5c31e4a18 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -79,22 +79,25 @@ foreach ($pictures as $row)
   {
     $thumbnail_title .= ' : '.$row['filesize'].' KB';
   }
+  
   // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?';
-  if ( isset($page['cat']) )
-  {
-    $url_link .= 'cat='.$page['cat'].'&';
-  }
-  $url_link.= 'image_id='.$row['id'];
-  if ($page['cat'] == 'search')
-  {
-    $url_link.= '&search='.$_GET['search'];
-  }
-  else if ($page['cat'] == 'list')
+  $url_link = PHPWG_ROOT_PATH.'picture.php?image_id='.$row['id'];
+
+  if (isset($page['cat']))
   {
-    $url_link.= '&list='.$_GET['list'];
+    $url_link.= 'cat='.$page['cat'].'&';
+
+    if ($page['cat'] == 'search')
+    {
+      $url_link.= '&search='.$_GET['search'];
+    }
+    else if ($page['cat'] == 'list')
+    {
+      $url_link.= '&list='.$_GET['list'];
+    }
   }
-  if ( isset($_GET['calendar']) )
+  
+  if (isset($_GET['calendar']))
   {
     $url_link.= '&calendar='.$_GET['calendar'];
   }