diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
| commit | c8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (patch) | |
| tree | 51709a1855d570ba495d81a172a029015341c2bd /system/core/Hooks.php | |
| parent | faa4890addbaa90254ef160813a08f727d069415 (diff) | |
| parent | 99f31e76bd06876cd3bf789f9d2774f79818b7df (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/core/Hooks.php')
| -rw-r--r-- | system/core/Hooks.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index 57e4a99a6..429d6bceb 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 1.0.0 @@ -99,14 +99,14 @@ class CI_Hooks { } // Grab the "hooks" definition file. - if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) + if (file_exists(APPPATH.'config/hooks.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); + include(APPPATH.'config/hooks.php'); } - if (file_exists(APPPATH.'config/hooks.php')) + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks.php')) { - include(APPPATH.'config/hooks.php'); + include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'); } // If there are no hooks, we're done. |