Merge branch 'master' of https://github.com/top-think/thinkphp

liu21st · liu21st · commit f31631e69e45 · 2016-01-20T14:15:20.000+08:00
diff --git a/ThinkPHP/Common/functions.php b/ThinkPHP/Common/functions.php
@@ -332,16 +332,16 @@ function I($name, $default = '', $filter = null, $datas = null)
             break;
         case 'param':
             switch ($_SERVER['REQUEST_METHOD']) {
-            case 'POST':
+                case 'POST':
                     $input = $_POST;
                     break;
-            case 'PUT':
+                case 'PUT':
                     if (is_null($_PUT)) {
                         parse_str(file_get_contents('php://input'), $_PUT);
                     }
                     $input = $_PUT;
                     break;
-            default:
+                default:
                     $input = $_GET;
             }
             break;
@@ -419,19 +419,19 @@ function I($name, $default = '', $filter = null, $datas = null)
         }
         if (!empty($type)) {
             switch (strtolower($type)) {
-                case 'a':    // 数组
+                case 'a': // 数组
                     $data = (array) $data;
                     break;
-                case 'd':    // 数字
+                case 'd': // 数字
                     $data = (int) $data;
                     break;
-                case 'f':    // 浮点
+                case 'f': // 浮点
                     $data = (float) $data;
                     break;
-                case 'b':    // 布尔
+                case 'b': // 布尔
                     $data = (boolean) $data;
                     break;
-                case 's':// 字符串
+                case 's': // 字符串
                 default:
                     $data = (string) $data;
             }
@@ -1144,7 +1144,7 @@ function U($url = '', $vars = '', $suffix = true, $domain = false)
             }
         }
     }
-    if (isset($anchor)) {
+    if (!empty($anchor)) {
         $url .= '#' . $anchor;
     }
     if ($domain) {
diff --git a/ThinkPHP/Library/Think/Route.class.php b/ThinkPHP/Library/Think/Route.class.php
@@ -188,28 +188,31 @@ public static function reverse($path, &$vars, $depr, $suffix = true)
                     // 匹配成功
                     if (!empty($flag)) {
                         foreach (array_keys($array) as $key) {
+                            $array[$key] = urlencode($array[$key]);
                             unset($vars[$key]);
                         }
                         return implode($depr, $array);
                     }
                 } else {
                     // 正则路由
                     $keys = !empty($args) ? array_keys($args) : array_keys($vars);
-                    $str = preg_replace_callback('/\(.+\)/', function ($match) use (&$vars, &$keys) {
+                    $temp_vars = $vars;
+                    $str = preg_replace_callback('/\(.*?\)/', function ($match) use (&$temp_vars, &$keys) {
                         $k = array_shift($keys);
-                        return isset($vars[$k]) ? $vars[$k] : '';
+                        $re_var = '';
+                        if(isset($temp_vars[$k]))
+                        {
+                            $re_var = $temp_vars[$k];
+                            unset($temp_vars[$k]);
+                        }
+                        return urlencode($re_var);
                     }, $rule);
                     $str = substr($str, 1, -1);
                     $str = rtrim(ltrim($str, '^'), '$');
                     $str = str_replace('\\', '', $str);
                     if (preg_match($rule, $str, $matches)) {
                         // 匹配成功
-                        if ($args) {
-                            $keys = array_keys($args);
-                        }
-                        foreach ($keys as $key) {
-                            unset($vars[$key]);
-                        }
+                        $vars = $temp_vars;
                         return str_replace('/', $depr, $str);
                     }
                 }
diff --git a/ThinkPHP/Tpl/think_exception.tpl b/ThinkPHP/Tpl/think_exception.tpl
@@ -1,8 +1,3 @@
-<?php
-    if(C('LAYOUT_ON')) {
-        echo '{__NOLAYOUT__}';
-    }
-?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head>
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
