Permalink
Browse files

No commit message

  • Loading branch information...
1 parent 4d7f901 commit 939fb62f5fe46fd0b21e4293e14e3a1166ccab76 qiang.xue committed Jul 2, 2010
Showing with 6 additions and 2 deletions.
  1. +6 −2 framework/web/CController.php
@@ -638,15 +638,19 @@ public function getLayoutFile($layoutName)
* @param string the view name
* @param string the directory that is used to search for a relative view name
* @param string the directory that is used to search for an absolute view name under the application
- * @param string the directory that is used to search for an absolute view name under the current module
+ * @param string the directory that is used to search for an absolute view name under the current module.
+ * If this is not set, the application base view path will be used.
* @return mixed the view file path. False if the view file does not exist.
* @since 1.0.3
*/
- public function resolveViewFile($viewName,$viewPath,$basePath,$moduleViewPath)
+ public function resolveViewFile($viewName,$viewPath,$basePath,$moduleViewPath=null)
{
if(empty($viewName))
return false;
+ if($moduleViewPath===null)
+ $moduleViewPath=$basePath;
+
if(($renderer=Yii::app()->getViewRenderer())!==null)
$extension=$renderer->fileExtension;
else

0 comments on commit 939fb62

Please sign in to comment.