From bcd1375aa80fbf60e7ca617530ed270d9f820b46 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 22 Feb 2016 09:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Error.php     | 2 --
 tests/thinkphp/baseTest.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/library/think/Error.php b/library/think/Error.php
index 55317620..d53b73f0 100644
--- a/library/think/Error.php
+++ b/library/think/Error.php
@@ -227,11 +227,9 @@ class Error
             'EXTEND_PATH'      => defined('EXTEND_PATH') ? EXTEND_PATH : 'undefined',
             'MODE_PATH'        => defined('MODE_PATH') ? MODE_PATH : 'undefined',
             'CORE_PATH'        => defined('CORE_PATH') ? CORE_PATH : 'undefined',
-            'ORG_PATH'         => defined('ORG_PATH') ? ORG_PATH : 'undefined',
             'TRAIT_PATH'       => defined('TRAIT_PATH') ? TRAIT_PATH : 'undefined',
             'APP_PATH'         => defined('APP_PATH') ? APP_PATH : 'undefined',
             'RUNTIME_PATH'     => defined('RUNTIME_PATH') ? RUNTIME_PATH : 'undefined',
-            'DATA_PATH'        => defined('DATA_PATH') ? DATA_PATH : 'undefined',
             'LOG_PATH'         => defined('LOG_PATH') ? LOG_PATH : 'undefined',
             'CACHE_PATH'       => defined('CACHE_PATH') ? CACHE_PATH : 'undefined',
             'TEMP_PATH'        => defined('TEMP_PATH') ? TEMP_PATH : 'undefined',
diff --git a/tests/thinkphp/baseTest.php b/tests/thinkphp/baseTest.php
index b64f5d96..408974bc 100644
--- a/tests/thinkphp/baseTest.php
+++ b/tests/thinkphp/baseTest.php
@@ -25,13 +25,11 @@ class baseTest extends \PHPUnit_Framework_TestCase
         $this->assertNotEmpty(EXTEND_PATH);
         $this->assertNotEmpty(MODE_PATH);
         $this->assertNotEmpty(CORE_PATH);
-        $this->assertNotEmpty(ORG_PATH);
         $this->assertNotEmpty(TRAIT_PATH);
         $this->assertNotEmpty(APP_PATH);
         $this->assertNotEmpty(APP_NAMESPACE);
         $this->assertNotEmpty(COMMON_MODULE);
         $this->assertNotEmpty(RUNTIME_PATH);
-        $this->assertNotEmpty(DATA_PATH);
         $this->assertNotEmpty(LOG_PATH);
         $this->assertNotEmpty(CACHE_PATH);
         $this->assertNotEmpty(TEMP_PATH);