r62690 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62689‎ | r62690 | r62691 >
Date:05:21, 19 February 2010
Author:tstarling
Status:ok
Tags:
Comment:
Reverted the extension part of r62416, core part was reverted in r62689.
Modified paths:
  • /trunk/extensions/geoserver/geoserver.php (modified) (history)

Diff [purge]

Index: trunk/extensions/geoserver/geoserver.php
@@ -20,7 +20,7 @@
2121 */
2222 function wfGeoServerExtension () {
2323 global $wgParser, $wgHooks ;
24 - $wgParser->setHook ( 'geo' , 'parseGeo' ) ;
 24+ $wgParser->setTransparentTagHook ( 'geo' , 'parseGeo' ) ;
2525 # $wgHooks['ArticleSaveComplete'][] = 'articleDeleteGeo';
2626 $wgHooks['ArticleDelete'][] = 'articleDeleteGeo';
2727 $wgHooks['ArticleEditUpdatesDeleteFromRecentchanges'][] = 'articleSaveGeo';
@@ -36,11 +36,8 @@
3737 *
3838 * Return markup, but also a pointer to Map sources
3939 */
40 -function parseGeo ( $text, $params, &$parser, &$frame ) {
 40+function parseGeo ( $text, $params, &$parser ) {
4141 global $action, $GeoserverParameters, $wgWikiMapsJS;
42 -
43 - $text = $parser->recursiveTagParse( $text, $frame );
44 -
4542 $latpat= '(-?[0-9.]*) *(([0-9.]+) *([0-9.]+)?)? *([NS])';
4643 $lonpat= '(-?[0-9.]*) *(([0-9.]+) *([0-9.]+)?)? *([EW])';
4744 $featcodepat = '(([AHLPRSTUV])\.([A-Z.]*))?';

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r62416Deprecate old undocumented workaround to bug 2257 (setTransparentTagHook)conrad02:22, 13 February 2010
r62689Moving Conrad's recent parser work out to a branch. Reverted r62434, r62416, ...tstarling05:19, 19 February 2010

Status & tagging log