From c6da50384e06c60e242cb4442abb9c6c9b450674 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 9 Mar 2010 20:44:27 -0600 Subject: completely removed Plugins from CodeIgniter --- system/application/config/autoload.php | 19 +---- system/core/Loader.php | 67 +--------------- system/plugins/index.html | 10 --- user_guide/changelog.html | 8 +- user_guide/general/autoloader.html | 3 +- user_guide/general/helpers.html | 2 +- user_guide/general/libraries.html | 2 +- user_guide/general/plugins.html | 127 ------------------------------- user_guide/general/reserved_names.html | 4 +- user_guide/helpers/captcha_helper.html | 4 +- user_guide/installation/upgrade_200.html | 25 +++--- user_guide/libraries/loader.html | 5 +- user_guide/nav/nav.js | 1 - user_guide/overview/appflow.html | 2 +- user_guide/overview/at_a_glance.html | 2 +- user_guide/overview/features.html | 2 +- user_guide/toc.html | 5 +- 17 files changed, 41 insertions(+), 247 deletions(-) delete mode 100644 system/plugins/index.html delete mode 100644 user_guide/general/plugins.html diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php index 1745d5cae..e7c6f0db1 100644 --- a/system/application/config/autoload.php +++ b/system/application/config/autoload.php @@ -20,10 +20,9 @@ | | 1. Libraries | 2. Helper files -| 3. Plugins -| 4. Custom config files -| 5. Language files -| 6. Models +| 3. Custom config files +| 4. Language files +| 5. Models | */ @@ -54,18 +53,6 @@ $autoload['libraries'] = array(); $autoload['helper'] = array(); -/* -| ------------------------------------------------------------------- -| Auto-load Plugins -| ------------------------------------------------------------------- -| Prototype: -| -| $autoload['plugin'] = array('captcha', 'js_calendar'); -*/ - -$autoload['plugin'] = array(); - - /* | ------------------------------------------------------------------- | Auto-load Config files diff --git a/system/core/Loader.php b/system/core/Loader.php index 1726f0a53..976823f81 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -41,7 +41,6 @@ class CI_Loader { var $_ci_loaded_files = array(); var $_ci_models = array(); var $_ci_helpers = array(); - var $_ci_plugins = array(); var $_ci_varmap = array('unit_test' => 'unit', 'user_agent' => 'agent'); @@ -445,64 +444,6 @@ class CI_Loader { // -------------------------------------------------------------------- - /** - * Load Plugin - * - * This function loads the specified plugin. - * - * @access public - * @param array - * @return void - */ - function plugin($plugins = array()) - { - foreach ($this->_ci_prep_filename($plugins, '_pi') as $plugin) - { - if (isset($this->_ci_plugins[$plugin])) - { - continue; - } - - if (file_exists(APPPATH.'plugins/'.$plugin.EXT)) - { - include_once(APPPATH.'plugins/'.$plugin.EXT); - } - else - { - if (file_exists(BASEPATH.'plugins/'.$plugin.EXT)) - { - include_once(BASEPATH.'plugins/'.$plugin.EXT); - } - else - { - show_error('Unable to load the requested file: plugins/'.$plugin.EXT); - } - } - - $this->_ci_plugins[$plugin] = TRUE; - log_message('debug', 'Plugin loaded: '.$plugin); - } - } - - // -------------------------------------------------------------------- - - /** - * Load Plugins - * - * This is simply an alias to the above function in case the - * user has written the plural form of this function. - * - * @access public - * @param array - * @return void - */ - function plugins($plugins = array()) - { - $this->plugin($plugins); - } - - // -------------------------------------------------------------------- - /** * Loads a language file * @@ -987,7 +928,7 @@ class CI_Loader { * Autoloader * * The config/autoload.php file contains an array that permits sub-systems, - * libraries, plugins, and helpers to be loaded automatically. + * libraries, and helpers to be loaded automatically. * * @access private * @param array @@ -1012,8 +953,8 @@ class CI_Loader { } } - // Autoload plugins, helpers and languages - foreach (array('helper', 'plugin', 'language') as $type) + // Autoload helpers and languages + foreach (array('helper', 'language') as $type) { if (isset($autoload[$type]) AND count($autoload[$type]) > 0) { @@ -1058,7 +999,7 @@ class CI_Loader { /** * Assign to Models * - * Makes sure that anything loaded by the loader class (libraries, plugins, etc.) + * Makes sure that anything loaded by the loader class (libraries, etc.) * will be available to models, if any exist. * * @access private diff --git a/system/plugins/index.html b/system/plugins/index.html deleted file mode 100644 index c942a79ce..000000000 --- a/system/plugins/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - 403 Forbidden - - - -

Directory access is forbidden.

- - - \ No newline at end of file diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 20cb9b75f..4f8c86ff0 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -62,6 +62,13 @@ Change Log Hg Tag: