unused code cleanup

yiisoft · Jun 16, 2010 · 105010d · 105010d
1 parent d145d2d
commit 105010d
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 18 deletions.
diff --git a/framework/base/CErrorHandler.php b/framework/base/CErrorHandler.php
@@ -213,7 +213,7 @@ protected function handleError($event)
 	protected function getExactTrace($exception)
 	{
 		$traces=$exception->getTrace();
-		$result=null;
+
 		foreach($traces as $trace)
 		{
 			// property access exception

diff --git a/framework/cli/commands/WebAppCommand.php b/framework/cli/commands/WebAppCommand.php
@@ -110,14 +110,7 @@ protected function getRelativePath($path1,$path2)
 		$segs2=explode(DIRECTORY_SEPARATOR,$path2);
 		$n1=count($segs1);
 		$n2=count($segs2);
-		$common='';
-		for($i=0;$i<$n1 && $i<$n2;++$i)
-		{
-			if($segs1[$i]===$segs2[$i])
-				$common.=($i?DIRECTORY_SEPARATOR:'').$segs1[$i];
-			else
-				break;
-		}
+
 		if($i===0)
 			return "'".$path1."'";
 		$up='';

diff --git a/framework/cli/commands/shell/ModelCommand.php b/framework/cli/commands/shell/ModelCommand.php
@@ -384,7 +384,6 @@ public function run($args)
 	public function generateModel($source,$params)
 	{
 		list($className,$tableName)=$params;
-		$content=file_get_contents($source);
 		$rules=array();
 		$labels=array();
 		$relations=array();

diff --git a/framework/i18n/gettext/CGettextMoFile.php b/framework/i18n/gettext/CGettextMoFile.php
@@ -74,7 +74,7 @@ public function load($file,$context)
 			throw new CException(Yii::t('yii','Unable to lock file "{file}" for reading.',
 				array('{file}'=>$file)));
 
-		$magic=current($array=unpack('c',$this->readByte($fr,4)));
+		$magic=current(unpack('c',$this->readByte($fr,4)));
 		if($magic==-34)
 			$this->useBigEndian=false;
 		else if($magic==-107)

diff --git a/framework/logging/CProfileLogRoute.php b/framework/logging/CProfileLogRoute.php
@@ -92,7 +92,6 @@ public function processLogs($logs)
 	protected function displayCallstack($logs)
 	{
 		$stack=array();
-		$level=0;
 		$results=array();
 		$n=0;
 		foreach($logs as $log)

diff --git a/framework/utils/CTimestamp.php b/framework/utils/CTimestamp.php
@@ -43,9 +43,6 @@
  */
 class CTimestamp
 {
-	private static $_monthNormal=array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	private static $_monthLeaf=array("",31,29,31,30,31,30,31,31,30,31,30,31);
-
 	/**
 	 * Gets day of week, 0 = Sunday,... 6=Saturday.
 	 * Algorithm from PEAR::Date_Calc

diff --git a/framework/web/widgets/CClipWidget.php b/framework/web/widgets/CClipWidget.php
@@ -30,8 +30,6 @@ class CClipWidget extends CWidget
 	 */
 	public $renderClip=false;
 
-	private $_level;
-
 	/**
 	 * Starts recording a clip.
 	 */

diff --git a/framework/web/widgets/captcha/CCaptchaAction.php b/framework/web/widgets/captcha/CCaptchaAction.php
@@ -96,7 +96,7 @@ public function run()
 	{
 		if(isset($_GET[self::REFRESH_GET_VAR]))  // AJAX request for regenerating code
 		{
-			$code=$this->getVerifyCode(true);
+			$this->getVerifyCode(true);
 			// we add a random 'v' parameter so that FireFox can refresh the image
 			// when src attribute of image tag is changed
 			echo $this->getController()->createUrl($this->getId(),array('v'=>uniqid()));