r67631 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67630‎ | r67631 | r67632 >
Date:16:12, 8 June 2010
Author:platonides
Status:resolved (Comments)
Tags:
Comment:
Escape for html $wgLocalStylePath.
Killed unused $wgStylePath globals.
Modified paths:
  • /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/Vector.php
@@ -35,7 +35,7 @@
3636 // wait for the CSS file to load before fetching the HTC file.
3737 $out->addScript(
3838 '<!--[if lt IE 7]><style type="text/css">body{behavior:url("' .
39 - $wgLocalStylePath .
 39+ htmlspecialchars($wgLocalStylePath) .
4040 '/vector/csshover.htc")}</style><![endif]-->'
4141 );
4242 }
@@ -70,7 +70,7 @@
7171 * @private
7272 */
7373 function buildNavigationUrls() {
74 - global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle, $wgStylePath;
 74+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle
7575 global $wgDisableLangConversion, $wgVectorUseIconWatch;
7676
7777 wfProfileIn( __METHOD__ );
@@ -676,7 +676,7 @@
677677 * when UI is in RTL mode
678678 */
679679 private function renderNavigation( $elements ) {
680 - global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgStylePath;
 680+ global $wgContLang, $wgVectorUseSimpleSearch, $wgVectorShowVariantName;
681681
682682 // If only one element was given, wrap it in an array, allowing more
683683 // flexible arguments

Follow-up revisions

RevisionCommit summaryAuthorDate
r67640follow-up to r67631: add semicolon backashley16:55, 8 June 2010
r677531.16wmf4: Merge some Vector fixes from trunk: r67537, r67544, r67576, r67631,...catrope19:52, 9 June 2010

Comments

#Comment by Catrope (talk | contribs)   16:52, 8 June 2010
-		global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle, $wgStylePath;
+		global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle

You've removed the semicolon, introducing a syntax error.

#Comment by Jack Phoenix (talk | contribs)   17:01, 8 June 2010

I've fixed this in r67640.

Status & tagging log