r115610 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r115609‎ | r115610 | r115611 >
Date:11:57, 15 July 2012
Author:dasch
Status:deferred
Tags:
Comment:
ThumbParser - moved hooks like wished in r98351
Modified paths:
  • /trunk/extensions/ThumbParser/ThumbParser.hooks.php (added) (history)
  • /trunk/extensions/ThumbParser/ThumbParser.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ThumbParser/ThumbParser.php
@@ -27,36 +27,5 @@
2828 $wgExtensionMessagesFiles['ThumbParserMagic'] = $dir . 'ThumbParser.i18n.magic.php';
2929
3030 # Define a setup function
31 -$wgHooks['ParserFirstCallInit'][] = 'efThumbParserFunction_Setup';
32 -
33 -function efThumbParserFunction_Setup( $parser ) {
34 - # Set a function hook associating the "example" magic word with our function
35 - $parser->setFunctionHook( 'thumb', 'efThumbParserFunction_Render' );
36 - return true;
37 -}
38 -
39 -function efThumbParserFunction_Render( $parser, $param1 = '') {
40 - # The parser function itself
41 - # The input parameters are wikitext with templates expanded
42 - # The output should be wikitext too
43 - global $wgThumbLimits, $wgUser;
44 - $param1 = strtolower($param1);
45 - $parser->disableCache(); # Mark this content as uncacheable
46 - $wopt = $wgUser->getOption('thumbsize');
47 - switch ($param1) {
48 - case 'size':
49 - $output = $wgThumbLimits[$wopt];
50 - break;
51 - case 'px':
52 - $output = $wgThumbLimits[$wopt].'px';
53 - break;
54 - case 'width':
55 - $size = intval($wgThumbLimits[$wopt])+10;
56 - $strsize = strval($size);
57 - $output = $strsize."px";
58 - break;
59 - default:
60 - $output = $wgThumbLimits[$wopt];
61 - }
62 - return $output;
63 -}
 31+$wgAutoloadClasses['ThumbParserHooks'] = "$dir/ThumbParser.hooks.php";
 32+$wgHooks['ParserFirstCallInit'][] = 'ThumbParserHooks::efThumbParserFunction_Setup';
Index: trunk/extensions/ThumbParser/ThumbParser.hooks.php
@@ -0,0 +1,34 @@
 2+<?php
 3+class ThumbParserHooks {
 4+ function efThumbParserFunction_Setup( $parser ) {
 5+ # Set a function hook associating the "example" magic word with our function
 6+ $parser->setFunctionHook( 'thumb', 'efThumbParserFunction_Render' );
 7+ return true;
 8+ }
 9+
 10+ function efThumbParserFunction_Render( $parser, $param1 = '') {
 11+ # The parser function itself
 12+ # The input parameters are wikitext with templates expanded
 13+ # The output should be wikitext too
 14+ global $wgThumbLimits, $wgUser;
 15+ $param1 = strtolower($param1);
 16+ $parser->disableCache(); # Mark this content as uncacheable
 17+ $wopt = $wgUser->getOption('thumbsize');
 18+ switch ($param1) {
 19+ case 'size':
 20+ $output = $wgThumbLimits[$wopt];
 21+ break;
 22+ case 'px':
 23+ $output = $wgThumbLimits[$wopt].'px';
 24+ break;
 25+ case 'width':
 26+ $size = intval($wgThumbLimits[$wopt])+10;
 27+ $strsize = strval($size);
 28+ $output = $strsize."px";
 29+ break;
 30+ default:
 31+ $output = $wgThumbLimits[$wopt];
 32+ }
 33+ return $output;
 34+ }
 35+}
Property changes on: trunk/extensions/ThumbParser/ThumbParser.hooks.php
___________________________________________________________________
Added: svn:eol-style
136 + native

Follow-up revisions

RevisionCommit summaryAuthorDate
r115612fix for r115610dasch12:36, 15 July 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r98351Adding Extensions FormatNum and ThumbParserdasch19:06, 28 September 2011

Status & tagging log