diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-06-04 23:10:31 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-06-05 21:23:49 +0200 |
commit | d088234d67f3aa422796d922e08a07949dc53d83 (patch) | |
tree | a964821b6b725dd26becbb3e91acf8d7dd5e0014 /application | |
parent | 048410164d2a17bbb588e43351e44eeb81610960 (diff) |
Move public files to ./public_html
./data/local is not moved because it contains likely untracked files
and moving it would throw an error when updating.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r-- | application/config/config.php | 4 | ||||
-rw-r--r-- | application/errors/error_404.php | 2 | ||||
-rw-r--r-- | application/errors/error_db.php | 2 | ||||
-rw-r--r-- | application/errors/error_general.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/application/config/config.php b/application/config/config.php index 9fe49d15f..45cff945e 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -464,8 +464,8 @@ $config['download_driver'] = 'php'; $config['download_nginx_location'] = '/protected-uploads'; -if (file_exists(FCPATH.'application/config/config-local.php')) { - include FCPATH.'application/config/config-local.php'; +if (file_exists(APPPATH.'config/config-local.php')) { + include APPPATH.'config/config-local.php'; } /* End of file config.php */ diff --git a/application/errors/error_404.php b/application/errors/error_404.php index cfe923d63..2e69d7e00 100644 --- a/application/errors/error_404.php +++ b/application/errors/error_404.php @@ -1,3 +1,3 @@ <?php $title = "404 Page Not Found"; -include "application/errors/error_general.php"; +include APPPATH."errors/error_general.php"; diff --git a/application/errors/error_db.php b/application/errors/error_db.php index 255513634..827d7cc31 100644 --- a/application/errors/error_db.php +++ b/application/errors/error_db.php @@ -1,3 +1,3 @@ <?php $title = "Database Error"; -include "application/errors/error_general.php"; +include APPPATH."errors/error_general.php"; diff --git a/application/errors/error_general.php b/application/errors/error_general.php index bc1a61973..ec9057025 100644 --- a/application/errors/error_general.php +++ b/application/errors/error_general.php @@ -22,7 +22,7 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) { exit(); } - include 'application/views/header.php'; + include APPPATH.'views/header.php'; ?> <div class="error"> @@ -31,7 +31,7 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) { </div> <?php - include 'application/views/footer.php'; + include APPPATH.'views/footer.php'; } elseif (php_sapi_name() === 'cli' OR defined('STDIN')) { echo "# $heading\n"; $msg = strip_tags(str_replace("<br>", "\n", $message)); |