summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-10-14 11:19:51 +0200
committerAndrey Andreev <narf@devilix.net>2013-10-14 11:19:51 +0200
commitdc7aab883ac0970fcc7ee99dc28bf3b8e11b74d2 (patch)
tree07624ef2884711676874a9ca5cdf7399aa8a9c90 /system/core/Loader.php
parent05ace616adaf9570052ad84d17fbb44b21ba499a (diff)
parentb53bd4e58f372b767ab33e0e7ffd89201710d043 (diff)
Merge pull request #2668 from garthkerr/patch-1
Add return type for view loader.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 2eef9979c..e0962510d 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -415,7 +415,7 @@ class CI_Loader {
* to be extracted for use in the view
* @param bool $return Whether to return the view output
* or leave it to the Output class
- * @return void
+ * @return void|string
*/
public function view($view, $vars = array(), $return = FALSE)
{
@@ -1293,4 +1293,4 @@ class CI_Loader {
}
/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */ \ No newline at end of file
+/* Location: ./system/core/Loader.php */