Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/214052
Change subject: empty php entry point ...................................................................... empty php entry point Change-Id: Ia4b86b7d99f23f93e1faa3eec9a61970b3fef475 --- M CodeEditor.php 1 file changed, 12 insertions(+), 103 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/52/214052/1 diff --git a/CodeEditor.php b/CodeEditor.php index 74cea86..ea9a1f9 100644 --- a/CodeEditor.php +++ b/CodeEditor.php @@ -15,106 +15,15 @@ * See https://www.mediawiki.org/wiki/Manual:Extension_registration for more details. */ -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'CodeEditor', - 'url' => 'https://www.mediawiki.org/wiki/Extension:CodeEditor', - 'author' => array( 'Brion Vibber', 'Derk-Jan Hartman', 'authors of Ace (ajax.org)' ), - 'descriptionmsg' => 'codeeditor-desc', -); - -$wgAutoloadClasses['CodeEditorHooks'] = __DIR__ . '/CodeEditor.hooks.php'; -$wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['CodeEditor'] = __DIR__ . '/CodeEditor.i18n.php'; - -$wgHooks['EditPage::showEditForm:initial'][] = 'CodeEditorHooks::editPageShowEditFormInitial'; -$wgHooks['EditPage::showReadOnlyForm:initial'][] = 'CodeEditorHooks::editPageShowEditFormInitial'; -$wgHooks['BeforePageDisplay'][] = 'CodeEditorHooks::onBeforePageDisplay'; -$wgHooks['MakeGlobalVariablesScript'][] = 'CodeEditorHooks::onMakeGlobalVariablesScript'; -$wgHooks['GetPreferences'][] = 'CodeEditorHooks::getPreferences'; - -$tpl = array( - 'localBasePath' => __DIR__ . '/modules', - 'remoteExtPath' => 'CodeEditor/modules', - 'group' => 'ext.wikiEditor', -); - -$wgResourceModules['ext.codeEditor'] = array( - 'scripts' => 'ext.codeEditor.js', - 'dependencies' => array( - 'ext.wikiEditor.toolbar', - 'jquery.codeEditor' - ), -) + $tpl; - -$wgResourceModules['jquery.codeEditor'] = array( - 'scripts' => 'jquery.codeEditor.js', - 'styles' => 'jquery.codeEditor.css', - 'dependencies' => array( - 'jquery.wikiEditor', - 'ext.codeEditor.ace', - 'jquery.ui.resizable', - 'mediawiki.api', - 'user.options', - ), - 'messages' => array( - 'codeeditor-toolbar-toggle', - 'codeeditor-save-with-errors' - ) -) + $tpl; - -// Minimal bundling of a couple bits of Ace -$wgResourceModules['ext.codeEditor.ace'] = array( - 'group' => 'ext.codeEditor.ace', - 'scripts' => array( - 'ace/ace.js', - 'ace/mode-javascript.js', - 'ace/mode-json.js', - 'ace/mode-css.js', - 'ace/mode-lua.js', - 'ace/ext-language_tools.js', - ), -) + $tpl; - -// Extra highlighting modes to match some available GeSHi highlighting languages -$wgResourceModules['ext.codeEditor.ace.modes'] = array( - 'group' => 'ext.codeEditor.ace', - 'scripts' => array( - 'ace/mode-c_cpp.js', - 'ace/mode-clojure.js', - 'ace/mode-csharp.js', - 'ace/mode-coffee.js', - 'ace/mode-groovy.js', - 'ace/mode-html.js', - 'ace/mode-java.js', - 'ace/mode-ocaml.js', - 'ace/mode-perl.js', - 'ace/mode-php.js', - 'ace/mode-python.js', - 'ace/mode-ruby.js', - 'ace/mode-scala.js', - ), - 'dependencies' => 'ext.codeEditor.ace', -) + $tpl; - -// Helper to add inline [edit] links to <source> sections -$wgResourceModules['ext.codeEditor.geshi'] = array( - 'scripts' => array( - 'ext.codeEditor.geshi.js' - ), - 'styles' => array( - 'ext.codeEditor.geshi.css' - ), - 'messages' => array( - 'editsection', - 'savearticle' - ), - 'dependencies' => 'mediawiki.api.parse', -) + $tpl; - -// Experimental feature; not ready yet. -$wgCodeEditorGeshiIntegration = false; - -// If this is disabled, CodeEditor will only be available for client-side code -// and extensions, it won't be enabled for standard CSS and JS pages. -$wgCodeEditorEnableCore = true; +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'CodeEditor' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['CodeEditor'] = __DIR__ . '/i18n'; + /* wfWarn( + 'Deprecated PHP entry point used for CodeEditor extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the CodeEditor extension requires MediaWiki 1.25+' ); +} -- To view, visit https://gerrit.wikimedia.org/r/214052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4b86b7d99f23f93e1faa3eec9a61970b3fef475 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
