removed more unneeded require_once() calls

11 files changed, 0 insertions, 20 deletions

diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 25d1066b0..afa496aed 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -364,7 +364,6 @@ EOD;
             #$result = $this->$method($args);
             $result = call_user_func_array(array(&$this,$method),$args);
         } elseif (substr($method, 0, 7) == 'plugin:') {
-            require_once(DOKU_INC.'inc/pluginutils.php');
             list($pluginname, $callback) = explode(':', substr($method, 7), 2);
             if(!plugin_isdisabled($pluginname)) {
                 $plugin = plugin_load('action', $pluginname);
diff --git a/inc/actions.php b/inc/actions.php
index 7f9cb26d0..91a1d9cdd 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -580,7 +580,6 @@ function act_subscription($act){
     $action = $params['action'];
 
     // Perform action.
-    require_once DOKU_INC . 'inc/subscription.php';
     if (!subscription_set($_SERVER['REMOTE_USER'], $target, $style, $data)) {
         throw new Exception(sprintf($lang["subscr_{$action}_error"],
                                     hsc($INFO['userinfo']['name']),
diff --git a/inc/common.php b/inc/common.php
index ef35ca863..c68eb2899 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1003,7 +1003,6 @@ function saveWikiText($id,$text,$summary,$minor=false){
 
     // if useheading is enabled, purge the cache of all linking pages
     if(useHeading('content')){
-        require_once(DOKU_INC.'inc/fulltext.php');
         $pages = ft_backlinks($id);
         foreach ($pages as $page) {
             $cache = new cache_renderer($page, wikiFN($page), 'xhtml');
@@ -1091,7 +1090,6 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
     }elseif($rev){
         $subject = $lang['mail_changed'].' '.$id;
         $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
-        require_once(DOKU_INC.'inc/DifferenceEngine.php');
         $df  = new Diff(explode("\n",rawWiki($id,$rev)),
                         explode("\n",rawWiki($id)));
         $dformat = new UnifiedDiffFormatter();
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 58d17422a..76dd01d1f 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -133,7 +133,6 @@ function ft_backlinks($id){
     $docs    = array_keys(ft_resultCombine(array_values($matches)));
     $docs    = array_filter($docs,'isVisiblePage'); // discard hidden pages
     if(!count($docs)) return $result;
-    require_once(DOKU_INC.'inc/parserutils.php');
 
     // check metadata for matching links
     foreach($docs as $match){
diff --git a/inc/html.php b/inc/html.php
index 5e1d0bab3..2d6c0a093 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -296,8 +296,6 @@ function html_hilight_callback($m) {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function html_search(){
-    require_once(DOKU_INC.'inc/search.php');
-    require_once(DOKU_INC.'inc/fulltext.php');
     global $conf;
     global $QUERY;
     global $ID;
@@ -690,7 +688,6 @@ function html_recent($first=0){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function html_index($ns){
-    require_once(DOKU_INC.'inc/search.php');
     global $conf;
     global $ID;
     $dir = $conf['datadir'];
@@ -828,7 +825,6 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
  * @author Michael Klier <chi@chimeric.de>
  */
 function html_backlinks(){
-    require_once(DOKU_INC.'inc/fulltext.php');
     global $ID;
     global $conf;
     global $lang;
@@ -856,7 +852,6 @@ function html_backlinks(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function html_diff($text='',$intro=true){
-    require_once(DOKU_INC.'inc/DifferenceEngine.php');
     global $ID;
     global $REV;
     global $lang;
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 6f2874fe5..00a3ad2d3 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -222,7 +222,6 @@ function check(){
         msg('The current page is not writable by you',0);
     }
 
-    require_once(DOKU_INC.'inc/HTTPClient.php');
     $check = wl('','',true).'data/_dummy';
     $http = new DokuHTTPClient();
     $http->timeout = 6;
diff --git a/inc/media.php b/inc/media.php
index 444e6d432..668f42d6a 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -149,7 +149,6 @@ function media_inuse($id) {
     global $conf;
     $mediareferences = array();
     if($conf['refcheck']){
-        require_once(DOKU_INC.'inc/fulltext.php');
         $mediareferences = ft_mediause($id,$conf['refshow']);
         if(!count($mediareferences)) {
             return false;
@@ -227,7 +226,6 @@ function media_delete($id,$auth){
 function media_upload($ns,$auth){
     if($auth < AUTH_UPLOAD) return false;
     if(!checkSecurityToken()) return false;
-    require_once(DOKU_INC.'inc/confutils.php');
     global $lang;
     global $conf;
 
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 34d9e5282..8e2c6e000 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -644,8 +644,6 @@ function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
 
     } else {
 
-        require_once(DOKU_INC . 'inc/geshi.php');
-
         $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
         $geshi->set_encoding('utf-8');
         $geshi->enable_classes();
diff --git a/inc/search.php b/inc/search.php
index ce4fefe06..9e0964404 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -194,7 +194,6 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){
     $info['writable'] = is_writable($base.'/'.$file);
     if(preg_match("/\.(jpe?g|gif|png)$/",$file)){
         $info['isimg'] = true;
-        require_once(DOKU_INC.'inc/JpegMeta.php');
         $info['meta']  = new JpegMeta($base.'/'.$file);
     }else{
         $info['isimg'] = false;
@@ -320,7 +319,6 @@ function search_backlinks(&$data,$base,$file,$type,$lvl,$opts){
     }
 
     //fetch instructions
-    require_once(DOKU_INC.'inc/parserutils.php');
     $instructions = p_cached_instructions($base.$file,true);
     if(is_null($instructions)) return false;
 
diff --git a/inc/subscription.php b/inc/subscription.php
index e98129b77..280da225d 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -275,7 +275,6 @@ function subscription_send_digest($subscriber_mail, $change, $lastupdate) {
     if (!is_null($rev)) {
         $subject = 'changed';
         $replaces['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
-        require_once DOKU_INC.'inc/DifferenceEngine.php';
         $df = new Diff(explode("\n", rawWiki($id, $rev)),
                         explode("\n", rawWiki($id)));
         $dformat = new UnifiedDiffFormatter();
diff --git a/inc/template.php b/inc/template.php
index bab68e549..bd5f58792 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -345,11 +345,9 @@ function tpl_metaheaders($alt=true){
             'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template'].'&tseed='.$tseed);
 
     // make $INFO and other vars available to JavaScripts
-    require_once(DOKU_INC.'inc/JSON.php');
     $json = new JSON();
     $script = "var NS='".$INFO['namespace']."';";
     if($conf['useacl'] && $_SERVER['REMOTE_USER']){
-        require_once(DOKU_INC.'inc/toolbar.php');
         $script .= "var SIG='".toolbar_signature()."';";
     }
     $script .= 'var JSINFO = '.$json->encode($JSINFO).';';