r83359 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r83358‎ | r83359 | r83360 >
Date:02:32, 6 March 2011
Author:jeroendedauw
Status:deferred
Tags:
Comment:
follow up to r83358
Modified paths:
  • /branches/Maps0.8/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php (modified) (history)
  • /branches/Maps0.8/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php (modified) (history)

Diff [purge]

Index: branches/Maps0.8/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
@@ -14,16 +14,9 @@
1515 * @see MapsBaseMap::getMapHTML()
1616 */
1717 public function getMapHTML( array $params, Parser $parser, $mapName ) {
18 - $output = $this->service->getOverlayOutput( $mapName, $params['overlays'], $params['controls'] );
19 -
20 - return $output . Html::element(
21 - 'div',
22 - array(
23 - 'id' => $mapName,
24 - 'style' => "width: {$params['width']}; height: {$params['height']}; background-color: #cccccc; overflow: hidden;",
25 - ),
26 - wfMsg( 'maps-loading-map' )
27 - );
 18+ return
 19+ $this->service->getOverlayOutput( $mapName, $params['overlays'], $params['controls'] )
 20+ . parent::getMapHTML( $params, $parser, $mapName );
2821 }
2922
3023 }
Index: branches/Maps0.8/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php
@@ -14,16 +14,9 @@
1515 * @see MapsBasePointMap::getMapHTML
1616 */
1717 public function getMapHTML( array $params, Parser $parser, $mapName ) {
18 - $output = $this->service->getOverlayOutput( $mapName, $params['overlays'], $params['controls'] );
19 -
20 - return $output . Html::element(
21 - 'div',
22 - array(
23 - 'id' => $mapName,
24 - 'style' => "width: {$params['width']}; height: {$params['height']}; background-color: #cccccc; overflow: hidden;",
25 - ),
26 - wfMsg( 'maps-loading-map' )
27 - );
 18+ return
 19+ $this->service->getOverlayOutput( $mapName, $params['overlays'], $params['controls'] )
 20+ . parent::getMapHTML( $params, $parser, $mapName );
2821 }
2922
3023 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r83358throw out no-longer needed complexity ftwjeroendedauw02:30, 6 March 2011

Status & tagging log