(Fixes issue 684)

yiisoft · Dec 7, 2009 · c5082ee · c5082ee
1 parent bb973d7
commit c5082ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -17,6 +17,7 @@ Version 1.0.11 to be released
 - Enh #672: Added Italian translation of error views (Qiang)
 - Enh #677: Improved CPgsqlColumnSchema to recognize more column data types (Qiang)
 - Enh #679: Added support for parsing and creating URLs with parameterized hostnames (Qiang)
+- Enh #684: Improved Yii::import() to throw exception when set_include_path fails (Qiang)
 - Enh #690: Enhanced the email validator pattern to capture 99% valid email addresses (Qiang)
 - Enh #703: Upgraded autocomplete js code to version 1.1.0 (Qiang)
 - Enh: Added core message translation in Thai (Peerajak)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
@@ -270,7 +270,8 @@ public static function import($alias,$forceInclude=false)
 						unset(self::$_includePaths[$pos]);
 				}
 				array_unshift(self::$_includePaths,$path);
-				set_include_path('.'.PATH_SEPARATOR.implode(PATH_SEPARATOR,self::$_includePaths));
+				if(set_include_path('.'.PATH_SEPARATOR.implode(PATH_SEPARATOR,self::$_includePaths))===false)
+					throw new CException(Yii::t('yii','Unable to import "{alias}". Please check your server configuration to make sure you are allowed to change PHP include_path.',array('{alias}'=>$alias)));
 				return self::$_imports[$alias]=$path;
 			}
 		}