From: <gi...@ma...> - 2009-01-06 15:16:34
|
The branch, master has been updated via 6f0f865bf6d02514f27467a0be378540c8f92681 (commit) from 5e1d1917659bf7fcdeabca206b71f36ac99792fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6f0f865bf6d02514f27467a0be378540c8f92681 Author: John Reese <jr...@le...> Date: Tue Jan 6 10:08:16 2009 -0500 Fix PHP class autoloading. Move MantisCoreWikiPlugin class into proper file for autoload. Remove unneeded munging of formatting class name; CoreFormattingPlugin should never need to be autoloaded. ----------------------------------------------------------------------- Summary of changes: core.php | 5 ----- core/classes/MantisCoreWikiPlugin.class.php | 12 ++++++++++++ core/classes/MantisWikiPlugin.class.php | 11 ----------- 3 files changed, 12 insertions(+), 16 deletions(-) ----------------------------------------------------------------------- commit 6f0f865bf6d02514f27467a0be378540c8f92681 Author: John Reese <jr...@le...> Date: Tue Jan 6 10:08:16 2009 -0500 Fix PHP class autoloading. Move MantisCoreWikiPlugin class into proper file for autoload. Remove unneeded munging of formatting class name; CoreFormattingPlugin should never need to be autoloaded. diff --git a/core.php b/core.php index 28fd5c5..3a26884 100644 --- a/core.php +++ b/core.php @@ -90,11 +90,6 @@ function __autoload( $className ) { global $g_core_path; - # Adjust for non-standard filenames. - if ( $className == 'MantisCoreFormattingPlugin' ) { - $className = 'MantisFormattingPlugin'; - } - $t_require_path = $g_core_path . 'classes' . DIRECTORY_SEPARATOR . $className . '.class.php'; if ( file_exists( $t_require_path ) ) { diff --git a/core/classes/MantisCoreWikiPlugin.class.php b/core/classes/MantisCoreWikiPlugin.class.php index c7adedf..18a8b9a 100644 --- a/core/classes/MantisCoreWikiPlugin.class.php +++ b/core/classes/MantisCoreWikiPlugin.class.php @@ -19,6 +19,18 @@ require_once( 'MantisWikiPlugin.class.php' ); /** + * Base that uses the old style wiki definitions from config_inc.php + */ +abstract class MantisCoreWikiPlugin extends MantisWikiPlugin { + function config() { + return array( + 'root_namespace' => config_get_global( 'wiki_root_namespace' ), + 'engine_url' => config_get_global( 'wiki_engine_url' ), + ); + } +} + +/** * Basic Dokuwiki support with old-style wiki integration. * @package MantisBT * @subpackage classes diff --git a/core/classes/MantisWikiPlugin.class.php b/core/classes/MantisWikiPlugin.class.php index 585e341..dc76e48 100644 --- a/core/classes/MantisWikiPlugin.class.php +++ b/core/classes/MantisWikiPlugin.class.php @@ -39,14 +39,3 @@ abstract class MantisWikiPlugin extends MantisPlugin { abstract function link_project( $p_event, $p_project_id ); } -/** - * Base that uses the old style wiki definitions from config_inc.php - */ -abstract class MantisCoreWikiPlugin extends MantisWikiPlugin { - function config() { - return array( - 'root_namespace' => config_get_global( 'wiki_root_namespace' ), - 'engine_url' => config_get_global( 'wiki_engine_url' ), - ); - } -} ----------------------------------------------------------------------- -- Mantis Bug Tracker |