From 0918f32ed304a357f9f845e706012e27365ce070 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 14 Jul 2011 17:44:58 -0400
Subject: [PATCH] w

---
 framework/base/YiiBase.php | 10 +++-------
 framework/yii.php          | 12 ++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/framework/base/YiiBase.php b/framework/base/YiiBase.php
index 42a697d..e903f24 100644
--- a/framework/base/YiiBase.php
+++ b/framework/base/YiiBase.php
@@ -3,9 +3,9 @@
 namespace yii;
 
 /**
- * Gets the application start timestamp.
+ * This constant defines the application start timestamp.
  */
-defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME',microtime(true));
+defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
 /**
  * This constant defines whether the application should be in debug mode or not. Defaults to false.
  */
@@ -15,7 +15,7 @@ defined('YII_DEBUG') or define('YII_DEBUG',false);
  * Defaults to 0, meaning no backtrace information. If it is greater than 0,
  * at most that number of call stacks will be logged. Note, only user application call stacks are considered.
  */
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',0);
+defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL', 0);
 /**
  * This constant defines whether exception handling should be enabled. Defaults to true.
  */
@@ -28,10 +28,6 @@ defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER',true);
  * Defines the Yii framework installation path.
  */
 defined('YII_PATH') or define('YII_PATH',dirname(__FILE__));
-/**
- * Defines the Zii library installation path.
- */
-defined('YII_ZII_PATH') or define('YII_ZII_PATH',YII_PATH.DIRECTORY_SEPARATOR.'zii');
 
 /**
  * YiiBase is a helper class serving common framework functionalities.
diff --git a/framework/yii.php b/framework/yii.php
index 1603a66..987de1e 100644
--- a/framework/yii.php
+++ b/framework/yii.php
@@ -4,14 +4,14 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright Copyright &copy; 2008-2012 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  * @version $Id: yii.php 2799 2011-01-01 19:31:13Z qiang.xue $
- * @package system
- * @since 1.0
+ * @package yii
+ * @since 2.0
  */
 
-require(__DIR__.'/base/YiiBase.php');
+require(__DIR__ . '/base/YiiBase.php');
 
 /**
  * Yii is a helper class serving common framework functionalities.
@@ -22,8 +22,8 @@ require(__DIR__.'/base/YiiBase.php');
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @version $Id: yii.php 2799 2011-01-01 19:31:13Z qiang.xue $
  * @package system
- * @since 1.0
+ * @since 2.0
  */
-class Yii extends yii\YiiBase
+class Yii extends \yii\YiiBase
 {
 }