Merge branch 'zentaopms_239'

framework/base/control.class.php

@@ -927,6 +927,12 @@ class baseControl
         if($type != 'json') die();
 
         $data = (array)$data;
+
+        /* Make sure locate in this tab. */
+        global $lang;
+        $moduleName = $this->app->rawModule;
+        if(isset($lang->navGroup->{$moduleName}) and $lang->navGroup->{$moduleName} != $this->app->tab and isset($data['locate']) and $data['locate'][0] == '/' and !helper::inOnlyBodyMode()) $data['locate'] .= "#app={$this->app->tab}";
+
         if(helper::isAjaxRequest() or $this->viewType == 'json')
         {
             /* Process for zh-cn in json. */

framework/base/helper.class.php

@@ -136,7 +136,7 @@ class baseHelper
          */
         if($viewType == $app->getViewType())
         {
-            $link .= $moduleName . '/';
+            $link .= $moduleName . '.' . $viewType;
             return self::processOnlyBodyParam($link, $onlyBody);
         }