From cef2106de1c7044072499aa5d4e529a01c3db8a4 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 30 Oct 2006 17:13:13 +0000 Subject: --- index.php | 16 +++- system/codeigniter/CodeIgniter.php | 4 +- system/libraries/Controller.php | 4 +- user_guide/changelog.html | 8 +- user_guide/general/alternative_php.html | 10 ++- user_guide/general/caching.html | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/managing_apps.html | 139 ------------------------------- user_guide/general/profiling.html | 2 +- user_guide/installation/upgrade_150.html | 8 +- user_guide/nav/nav.js | 2 +- user_guide/toc.html | 2 +- 12 files changed, 41 insertions(+), 158 deletions(-) delete mode 100644 user_guide/general/managing_apps.html diff --git a/index.php b/index.php index 0386ed6ed..6c839ec54 100644 --- a/index.php +++ b/index.php @@ -32,7 +32,11 @@ error_reporting(E_ALL); |--------------------------------------------------------------- | | If you want this front controller to use a different "application" -| folder then the default one you can set its name here. +| folder then the default one you can set its name here. +| The folder can also be relocated anywhere on your server. For +| more info please see the user guide: +| http://www.codeigniter.com/user_guide/general/managing_apps.html +| | | NO TRAILING SLASH! | @@ -77,7 +81,15 @@ define('EXT', '.'.pathinfo(__FILE__, PATHINFO_EXTENSION)); define('FCPATH', __FILE__); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); define('BASEPATH', $system_folder.'/'); -define('APPPATH', BASEPATH.$application_folder.'/'); + +if ( ! is_dir($application_folder)) +{ + define($application_folder.'/'); +} +else +{ + define('APPPATH', BASEPATH.$application_folder.'/'); +} // Load the front controller and away we go!.... require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index fb27191ce..5b3f54ae3 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -115,11 +115,9 @@ $LANG =& load_class('Language'); * Note: The Loader class needs to be included first * */ - -load_class('Loader', FALSE); - if (floor(phpversion()) < 5) { + load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 922382ab7..c8fa646c7 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -74,11 +74,11 @@ class Controller extends CI_Base { $this->$var =& load_class($class); } - // In PHP 5 the Controller class is run as a discreet + // In PHP 5 the Loader class is run as a discreet // class. In PHP 4 it extends the Controller if (floor(phpversion()) >= 5) { - $this->load = new CI_Loader(); + $this->load =& load_class('Loader'); $this->load->_ci_autoloader(); } else diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1d48e1258..099614d6d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,8 @@ Change Log
  • Added new File Helper: get_filenames()
  • Added new helper: Smiley Helper
  • Added support for <ul> and <ol> lists in the HTML Helper
    • +
  • Added the ability to rewrite short tags on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.
    • +
  • Added the ability to rename or relocate the "application" folder.
  • Added more thorough initialization in the upload class so that all class variables are reset.
  • Added "is_numeric" to validation, which uses the native PHP is_numeric function.
  • Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.
    • @@ -94,12 +96,12 @@ Change Log
  • Updated the input->cookie() and input->post() functions in Input Class to permit arrays contained cookies that are arrays to be run through the XSS filter.
  • Documented three functions from the Validation class that were missing from the user guide: set_select(), set_radio(), and set_checkbox().
  • Fixed a bug in the Email class related to SMTP Helo data.
    • -
  • Fixed a bugin the word wrapping heper and function in the email class.
    • +
  • Fixed a bug in the word wrapping helper and function in the email class.
  • Fixed a bug in the validation class.
  • Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.
  • Fixed a problem in the form_prep() function that was double encoding entities.
  • Fixed a bug that affects some versions of PHP when output buffering is nested.
    • -
  • Fixed a bug that caused CI to stop working when the PHP magic __get() function was used within models or controllers.
    • +
  • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
  • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
  • Deprecated $this->db->field_names() USE $this->db->list_fields()
  • Deprecated the $config['log_errors'] item from the config.php file. Instead, $config['log_threshold'] can be set to "0" to turn it off.
    • @@ -315,7 +317,7 @@ all controller methods are prefixed with _ci to avoid controller coll -- cgit v1.2.3-24-g4f1b