http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98106
Revision: 98106
Author: yaron
Date: 2011-09-26 02:35:20 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Improved some code, including removing unused code copied from the TemplateInfo
extension
Modified Paths:
--------------
trunk/extensions/PageSchemas/PageSchemas.hooks.php
Modified: trunk/extensions/PageSchemas/PageSchemas.hooks.php
===================================================================
--- trunk/extensions/PageSchemas/PageSchemas.hooks.php 2011-09-26 02:22:21 UTC
(rev 98105)
+++ trunk/extensions/PageSchemas/PageSchemas.hooks.php 2011-09-26 02:35:20 UTC
(rev 98106)
@@ -10,21 +10,22 @@
// Initialization
public static function register( &$parser ) {
+ global $wgOut, $wgScriptPath;
+
// Register the hook with the parser
$parser->setHook( 'PageSchema', array( 'PageSchemasHooks',
'render' ) );
// add the CSS
- global $wgOut, $wgScriptPath;
- $wgOut->addStyle($wgScriptPath .
'/extensions/PageSchemas/PageSchemas.css');
+ $wgOut->addStyle( $wgScriptPath .
'/extensions/PageSchemas/PageSchemas.css' );
return true;
}
-
// Render the displayed XML, if any
public static function render( $input, $args, $parser, $frame ) {
- // if this call is contained in a transcluded page or template,
- // or if the input is empty, display nothing
- if ( !$frame->title->equals( $parser->getTitle() ) || $input ==
'' )
+ // If this call is contained in a transcluded page or template,
+ // or if the input is empty, display nothing.
+ if ( !$frame->title->equals( $parser->getTitle() ) || $input ==
'' ) {
return;
+ }
// TODO: Do processing here, like parse to an array
$error_msg = null;
@@ -32,31 +33,17 @@
// recreate the top-level <PageSchema> tag, with whatever
// attributes it contained, because that was actually a tag-
// function call, as opposed to a real XML tag
- $input = Xml::tags('PageSchema', $args, $input);
+ $input = Xml::tags( 'PageSchema', $args, $input );
- // if 'type=' was specified, and it wasn't set to one of the
- // allowed values (currently just 'auto'), don't validate -
- // just display the XML
- if ( array_key_exists( 'type', $args ) && $args['type'] !=
'auto' ) {
- // Store XML in the page_props table - the Javascript
- // can figure out on its own whether or not to handle it
- $parser->getOutput()->setProperty( 'PageSchema', $input
);
- // TODO - a hook should be called here, to allow other
- // XML handlers to parse and display this
- $text = Html::element('p', null, "The (unhandled) XML
definition for this schema is:") . "\n";
- $text .= Html::element('pre', null, $input);
- return $text;
- }
-
if ( $xml_object = PageSchemas::validateXML( $input, $error_msg
) ) {
- // Store XML in the page_props table
+ // Store the XML in the page_props table
$parser->getOutput()->setProperty( 'PageSchema', $input
);
$text = PageSchemas::parsePageSchemas( $xml_object );
} else {
// Store error message in the page_props table
$parser->getOutput()->setProperty( 'PageSchema',
$error_msg );
- $text = Html::element('p', null, "The (incorrect) XML
definition for this template is:") . "\n";
- $text .= Html::element('pre', null, $input);
+ $text = Html::element( 'p', null, "The (incorrect) XML
definition for this template is:" ) . "\n";
+ $text .= Html::element( 'pre', null, $input );
}
// return output
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
