diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-12-26 18:59:30 +0100 |
| commit | 358ffec0a6b2a1fcc55e09623619126671d3e65f (patch) | |
| tree | 6888d3f0a73500575db564cb4e5dbe5b828e4589 /system/helpers/html_helper.php | |
| parent | d9f0a1496af1dfca7c317028708b2cd1e5727cea (diff) | |
| parent | 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (diff) | |
Merge pull request #826 from EllisLab/feature/abstract-config-load
Abstracting the loading of files in the config directory depending on environments
Diffstat (limited to 'system/helpers/html_helper.php')
| -rw-r--r-- | system/helpers/html_helper.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index b6bb402a8..fa805f14f 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -275,14 +275,7 @@ if ( ! function_exists('doctype')) if ( ! is_array($_doctypes)) { - if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php')) - { - include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'); - } - elseif (is_file(APPPATH.'config/doctypes.php')) - { - include(APPPATH.'config/doctypes.php'); - } + load_environ_config('doctypes'); if ( ! is_array($_doctypes)) { |