No commit message

yiisoft · Jan 28, 2009 · 793cc74 · 793cc74
1 parent 76b0688
commit 793cc74
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/framework/web/CSort.php b/framework/web/CSort.php
@@ -181,6 +181,8 @@ protected function resolveLabel($attribute)
 			$baseModel=CActiveRecord::model($this->modelClass);
 			if(($relation=$baseModel->getActiveRelation(substr($attribute,0,$pos)))!==null)
 				return CActiveRecord::model($relation->className)->getAttributeLabel(substr($attribute,$pos+1));
+			else
+				return $baseModel->getAttributeLabel(substr($attribute,$pos+1));
 		}
 		return CActiveRecord::model($this->modelClass)->getAttributeLabel($attribute);
 	}