Index: trunk/kernel/parser.php
===================================================================
diff -u -r858 -r875
--- trunk/kernel/parser.php	(.../parser.php)	(revision 858)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 875)
@@ -1317,7 +1317,7 @@
     if($LangId)
     {
       $m_var_list_update["lang"] = $LangId;
-      $ret = GetIndexURL()."?env=".BuildEnv();
+      $ret = GetIndexURL(2)."?env=".BuildEnv();
       unset($m_var_list_update["lang"]);
     }
     else
@@ -1429,7 +1429,7 @@
        $Id = 0;
    }
    $m_var_list_update["theme"] = $Id;
-   $ret = GetIndexURL()."?env=".BuildEnv();
+   $ret = GetIndexURL(2)."?env=".BuildEnv();
    unset($m_var_list_update["theme"]);
    return $ret;
 }
@@ -2245,7 +2245,9 @@
       }
     }
 
-    if($attribs["_secure"])
+    $ret = GetIndexURL(2)."?env=".BuildEnv().$query;
+    
+    /*if($attribs["_secure"])
     {
     	$ret = GetIndexURL(1)."?env=".BuildEnv().$query;
     }
@@ -2254,7 +2256,9 @@
     	$ret = GetIndexURL(2)."?env=".BuildEnv().$query;
     }
     else
+    {
     	$ret = GetIndexURL()."?env=".BuildEnv().$query;
+    }*/
     	
     if(strlen($attribs["_anchor"]))
         $ret .= "#".$attribs["_anchor"];
@@ -2347,7 +2351,7 @@
      $var_list_update["t"]  = $template;
   }
 
-  $ret = GetIndexURL()."?env=".BuildEnv();
+  $ret = GetIndexURL(2)."?env=".BuildEnv();
   unset($var_list_update["t"]);
   if(strlen($dest))
       $ret .= "&dest=$dest";