diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /inc/load.php | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/load.php')
| -rw-r--r-- | inc/load.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/load.php b/inc/load.php index b8a279523..5ca9b4cd8 100644 --- a/inc/load.php +++ b/inc/load.php @@ -51,7 +51,6 @@ function load_autoload($name){ 'DokuHTTPClient' => DOKU_INC.'inc/HTTPClient.php', 'HTTPClient' => DOKU_INC.'inc/HTTPClient.php', 'JSON' => DOKU_INC.'inc/JSON.php', - 'adLDAP' => DOKU_INC.'inc/adLDAP.php', 'Diff' => DOKU_INC.'inc/DifferenceEngine.php', 'UnifiedDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php', 'TableDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php', @@ -71,6 +70,7 @@ function load_autoload($name){ 'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php', 'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php', 'GeSHi' => DOKU_INC.'inc/geshi.php', + 'Tar' => DOKU_INC.'inc/Tar.class.php', 'TarLib' => DOKU_INC.'inc/TarLib.class.php', 'ZipLib' => DOKU_INC.'inc/ZipLib.class.php', 'DokuWikiFeedCreator' => DOKU_INC.'inc/feedcreator.class.php', @@ -81,11 +81,13 @@ function load_autoload($name){ 'Mailer' => DOKU_INC.'inc/Mailer.class.php', 'RemoteAPI' => DOKU_INC.'inc/remote.php', 'RemoteAPICore' => DOKU_INC.'inc/RemoteAPICore.php', + 'Subscription' => DOKU_INC.'inc/subscription.php', 'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php', 'DokuWiki_Admin_Plugin' => DOKU_PLUGIN.'admin.php', 'DokuWiki_Syntax_Plugin' => DOKU_PLUGIN.'syntax.php', 'DokuWiki_Remote_Plugin' => DOKU_PLUGIN.'remote.php', + 'DokuWiki_Auth_Plugin' => DOKU_PLUGIN.'auth.php', ); @@ -95,7 +97,7 @@ function load_autoload($name){ } // Plugin loading - if(preg_match('/^(helper|syntax|action|admin|renderer|remote)_plugin_('.DOKU_PLUGIN_NAME_REGEX.')(?:_([^_]+))?$/', + if(preg_match('/^(auth|helper|syntax|action|admin|renderer|remote)_plugin_('.DOKU_PLUGIN_NAME_REGEX.')(?:_([^_]+))?$/', $name, $m)) { // try to load the wanted plugin file $c = ((count($m) === 4) ? "/{$m[3]}" : ''); |