Index: trunk/kernel/include/category.php
===================================================================
diff -u -r1442 -r1566
--- trunk/kernel/include/category.php	(.../category.php)	(revision 1442)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 1566)
@@ -998,13 +998,12 @@
             case "link_selector":
                 $m_var_list_update["cat"] = $this->Get("CategoryId");
                 $ret = $_SERVER["PHP_SELF"]."?env=" . BuildEnv();
+
                 
-                // pass through selector
-                if( isset($_REQUEST['Selector']) ) $ret .= '&Selector='.$_REQUEST['Selector'];
+				$tmp = GetVar('Selector'); if($tmp) $ret .= '&Selector='.$tmp;
+                $tmp = GetVar('new'); if($tmp) $ret .= '&new='.$tmp;
+                $tmp = GetVar('destform'); if($tmp) $ret .= '&destform='.$tmp;
                 
-                // pass new status
-                if( isset($_REQUEST['new']) ) $ret .= '&new='.$_REQUEST['new'];
-                
                 unset($m_var_list_update["cat"]);
                 return $ret;
                 break;
@@ -1823,7 +1822,10 @@
 
 	$selector = isset($_REQUEST['Selector']) ? '&Selector='.$_REQUEST['Selector'] : '';
 	$new = isset($_REQUEST['new']) ? '&new='.$_REQUEST['new'] : '';
-
+	$destform = GetVar('destform') !== false ? '&destform='.GetVar('destform') : '';
+	
+	$add = $selector.$new.$destform;
+	
     $nav = "";
     $m_var_list_update["p"]=1;   
     if(strlen($target_template)==0)
@@ -1836,7 +1838,7 @@
         if ($LinkRoot)
         {
         	$var_list_update["t"] = strlen($RootTemplate)? $RootTemplate : $target_template;
-        	$nav = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$selector.$new."\">$cat_name</a>";	}
+        	$nav = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">$cat_name</a>";	}
         else
         	$nav = "<span class=\"NAV_CURRENT_ITEM\">$cat_name</span>";
     }
@@ -1866,7 +1868,7 @@
         {          
           if ($admin == 1)       
           {
-            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
           }
           else
           {
@@ -1878,7 +1880,7 @@
             {
               $var_list_update["t"] = $target_template;
             }
-            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
           }
         }
       }
@@ -1895,7 +1897,7 @@
         {          
           if ($admin == 1)       
           {
-            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
           }
           else
           {
@@ -1905,7 +1907,7 @@
             }
             else
               $var_list_update["t"] = $target_template;
-            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+            $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
           }
         }
         
@@ -1939,12 +1941,12 @@
               {          
                 if ($admin == 1)       
                 {
-                  $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+                  $nav[] = "<a class=\"control_link\" href=\"".$_SERVER["PHP_SELF"]."?env=". BuildEnv().$add."\">".$cat_name."</a>";
                 }
                 else
                 {
                   $var_list_update["t"] = $t;
-                  $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$selector.$new."\">".$cat_name."</a>";
+                  $nav[] = "<a class=\"navbar\" href=\"".GetIndexURL(2)."?env=". BuildEnv().$add."\">".$cat_name."</a>";
                   unset($var_list_update["t"]);
                 }
               }