Merge pull request bcit-ci#4262 from zhanghongyi/doc-security

narfbg · narfbg · commit 2eacf4c50f17 · 2015-11-24T11:26:50.000+02:00
[ci skip] Update CI_Lang docs for exceptions
diff --git a/system/core/Lang.php b/system/core/Lang.php
@@ -82,8 +82,8 @@ public function __construct()
 	 * @param	bool	$return		Whether to return the loaded array of translations
 	 * @param 	bool	$add_suffix	Whether to add suffix to $langfile
 	 * @param 	string	$alt_path	Alternative path to look for the language file
-	 *
 	 * @return	void|string[]	Array containing translations, if $return is set to TRUE
+	 * @throws	RuntimeException	If unable to load the requested language file
 	 */
 	public function load($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '')
 	{
diff --git a/user_guide_src/source/libraries/language.rst b/user_guide_src/source/libraries/language.rst
@@ -196,6 +196,7 @@ Class Reference
 		:param	string	$alt_path: An alternative path to look in for the language file
 		:returns:	Array of language lines if $return is set to TRUE, otherwise void
 		:rtype:	mixed
+		:throws:	RuntimeException	If unable to load the requested language file
 
 		Loads a language file.
 
@@ -207,4 +208,4 @@ Class Reference
 		:rtype:	string
 
 		Fetches a single translation line from the already loaded language files,
-		based on the line's name.
+		based on the line's name.
