* Fix bug #26768.

bin/ztcli

@@ -74,5 +74,4 @@ else
 }
 
 $app->parseRequest();
-$app->setParams();
 $app->loadModule();

framework/api/router.class.php

@@ -191,11 +191,7 @@ class api extends router
     public function loadModule()
     {
         /* If the version of api don't exists, call parent method. */
-        if(!$this->version)
-        {
-            parent::setParams();
-            return parent::loadModule();
-        }
+        if(!$this->version) return parent::loadModule();
 
         $entry = strtolower($this->entry);
         include($this->appRoot . "api/$this->version/entries/$entry.php");

framework/base/router.class.php

@@ -1540,11 +1540,12 @@ class baseRouter
                     $_COOKIE  = validater::filterParam($_COOKIE, 'cookie');
                 }
             }
-
+            return true;
         }
         catch(EndResponseException $endResponseException)
         {
             echo $endResponseException->getContent();
+            return false;
         }
     }
 
@@ -2146,6 +2147,8 @@ class baseRouter
     public function loadModule()
     {
         try {
+            if(is_null($this->params) and !$this->setParams()) return false;
+
             /* 调用该方法   Call the method. */
             $module = $this->control;
 

roadrunner/cron-worker.php

@@ -32,5 +32,4 @@ $common = $app->loadCommon();
 $app->moduleName = 'cron';
 $app->methodName = 'ajaxExec';
 $app->setControlFile();
-$app->setParams();
 $app->loadModule();

www/api.php

@@ -46,7 +46,6 @@ $app->parseRequest();
 /* Old version need check priv here, new version check priv in entry. */
 if(!$app->version) $common->checkPriv();
 
-$app->setParams();
 $app->loadModule();
 
 $output = ob_get_clean();

www/index.php

@@ -68,6 +68,7 @@ if($app->clientDevice == 'mobile' and (strpos($config->version, 'pro') === 0 or
 if(!empty($_GET['display']) && $_GET['display'] == 'card') $config->default->view = 'xhtml';
 
 $app->parseRequest();
+if(!$app->setParams()) return;
 $app->setParams();
 $common->checkPriv();
 $common->checkIframe();

www/install.php.tmp

@@ -33,5 +33,4 @@ $app->setDebug();
 if(isset($config->installed) and $config->installed) $app->connectDB();
 
 $app->parseRequest();
-$app->setParams();
 $app->loadModule();

www/upgrade.php.tmp

@@ -80,8 +80,4 @@ if($app->isContainer())
 
 /* Run it. */
 $app->parseRequest();
-if($common->checkUpgradeStatus())
-{
-    $app->setParams();
-    $app->loadModule();
-}
+if($common->checkUpgradeStatus()) $app->loadModule();