do not autorequire class only libraries

those are loaded on demand through the autoloader mechanism

Also cliopts.php is not loaded automatically at all

1 files changed, 4 insertions, 16 deletions

diff --git a/inc/load.php b/inc/load.php
index 9d305e3a9..792f05e27 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -10,29 +10,17 @@ spl_autoload_register('load_autoload');
 
 // require all the common libraries
 // for a e few of these order does matter
-require_once(DOKU_INC.'inc/DifferenceEngine.php');
-require_once(DOKU_INC.'inc/EmailAddressValidator.php');
-require_once(DOKU_INC.'inc/SimplePie.php');
-require_once(DOKU_INC.'inc/FeedParser.php');
-require_once(DOKU_INC.'inc/HTTPClient.php');
 require_once(DOKU_INC.'inc/IXR_Library.php');
-require_once(DOKU_INC.'inc/JSON.php');
-require_once(DOKU_INC.'inc/JpegMeta.php');
-require_once(DOKU_INC.'inc/TarLib.class.php');
-require_once(DOKU_INC.'inc/ZipLib.class.php');
 require_once(DOKU_INC.'inc/adLDAP.php');
 require_once(DOKU_INC.'inc/blowfish.php');
 require_once(DOKU_INC.'inc/feedcreator.class.php');
 require_once(DOKU_INC.'inc/geshi.php');
 require_once(DOKU_INC.'inc/actions.php');
-require_once(DOKU_INC.'inc/cache.php');
 require_once(DOKU_INC.'inc/changelog.php');
-require_once(DOKU_INC.'inc/cliopts.php');
 require_once(DOKU_INC.'inc/common.php');
 require_once(DOKU_INC.'inc/confutils.php');
 require_once(DOKU_INC.'inc/pluginutils.php');
 require_once(DOKU_INC.'inc/plugin.php');
-require_once(DOKU_INC.'inc/plugincontroller.class.php');
 require_once(DOKU_INC.'inc/events.php');
 require_once(DOKU_INC.'inc/form.php');
 require_once(DOKU_INC.'inc/fulltext.php');
@@ -58,7 +46,7 @@ require_once(DOKU_INC.'inc/auth.php');
  * spl_autoload_register callback
  *
  * Contains a static list of DokuWiki's core classes and automatically
- * requires their associated php files when an object is instantiated.
+ * require()s their associated php files when an object is instantiated.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @todo   add generic loading of plugins here
@@ -67,7 +55,6 @@ function load_autoload($name){
     static $classes = null;
     if(is_null($classes)) $classes = array(
         'DokuHTTPClient'        => DOKU_INC.'inc/HTTPClient.php',
-        'DokuEvent'             => DOKU_INC.'inc/',
         'JSON'                  => DOKU_INC.'inc/JSON.php',
         'adLDAP'                => DOKU_INC.'inc/adLDAP.php',
         'Diff'                  => DOKU_INC.'inc/DifferenceEngine.php',
@@ -79,15 +66,16 @@ function load_autoload($name){
         'cache_renderer'        => DOKU_INC.'inc/cache.php',
         'Doku_Event'            => DOKU_INC.'inc/events.php',
         'Doku_Event_Handler'    => DOKU_INC.'inc/events.php',
-        'Doku_Form'             => DOKU_INC.'inc/form.php',
         'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
         'JpegMeta'              => DOKU_INC.'inc/JpegMeta.php',
+        'SimplePie'             => DOKU_INC.'inc/SimplePie.php',
         'FeedParser'            => DOKU_INC.'inc/FeedParser.php',
-        'utf8_entity_decoder'   => DOKU_INC.'inc/utf8.php',
         'IXR_Server'            => DOKU_INC.'inc/IXR_Library.php',
         'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
         'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
         'GeSHi'                 => DOKU_INC.'inc/geshi.php',
+        'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
+        'ZibLib'                => DOKU_INC.'inc/ZipLib.class.php',
     );
 
     if(isset($classes[$name])){