From 4759b994b587414e6bf82543c7a04ae51da226fa Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 3 Mar 2016 10:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0IS=5FMAC=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base.php | 1 + library/think/Loader.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base.php b/base.php index 066937d1..ad90ffb8 100644 --- a/base.php +++ b/base.php @@ -49,6 +49,7 @@ defined('APP_MODE') or define('APP_MODE', function_exists('saeAutoLoader') ? 'sa // 环境常量 define('IS_CGI', strpos(PHP_SAPI, 'cgi') === 0 ? 1 : 0); define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0); +define('IS_MAC', strstr(PHP_OS, 'Darwin') ? 1 : 0); define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0); define('IS_AJAX', (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ? true : false); define('NOW_TIME', $_SERVER['REQUEST_TIME']); diff --git a/library/think/Loader.php b/library/think/Loader.php index 3baf8868..dd638f37 100644 --- a/library/think/Loader.php +++ b/library/think/Loader.php @@ -61,7 +61,7 @@ class Loader if (is_file($filename)) { // 开启调试模式Win环境严格区分大小写 if (APP_DEBUG && IS_WIN && false === strpos(realpath($filename), $class . EXT)) { - return; + return false; } // 记录加载信息 APP_DEBUG && self::$load[] = $filename;