Localisation updates for core and extension messages from translatewiki.net (2010...

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 277a915..f1b5998 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1223,7 +1223,7 @@ class EditPage {
                if ( $this->showHeader() === false )
                        return;
 
-               $action = htmlspecialchars($this->getActionURL($wgTitle));
+               $action = htmlspecialchars( $this->getActionURL( $wgTitle ) );
 
                if ( $wgUser->getOption( 'showtoolbar' ) and !$this->isCssJsSubpage ) {
                        # prepare toolbar for edit buttons
@@ -1883,11 +1883,11 @@ HTML
                if ( $this->isCssJsSubpage || $this->mTitle->isCssOrJsPage() ) {
                        $level = 'user';
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                               $level = 'global';
+                               $level = 'site';
                        }
 
                        # Used messages to make sure grep find them:
-                       # usercsspreview, userjspreview, globalcsspreview, globaljspreview
+                       # Messages: usercsspreview, userjspreview, sitecsspreview, sitejspreview
                        if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) {
                                $previewtext = "<div id='mw-{$level}csspreview'>\n" . wfMsg( "{$level}csspreview" ) . "\n</div>";
                                $class = "mw-code mw-css";
@@ -2355,7 +2355,9 @@ HTML
                        );
                        $checkboxes['minor'] =
                                Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) .
-                               "&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" . $skin->titleAttrib( 'minoredit', 'withaccess' ) . ">{$minorLabel}</label>";
+                               "&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" .
+                               Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'minoredit', 'withaccess' ) ) ) .
+                               ">{$minorLabel}</label>";
                }
 
                $watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) );
@@ -2368,7 +2370,9 @@ HTML
                        );
                        $checkboxes['watch'] =
                                Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
-                               "&#160;<label for='wpWatchthis' id='mw-editpage-watch'" . $skin->titleAttrib( 'watch', 'withaccess' ) . ">{$watchLabel}</label>";
+                               "&#160;<label for='wpWatchthis' id='mw-editpage-watch'" .
+                               Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'watch', 'withaccess' ) ) ) .
+                               ">{$watchLabel}</label>";
                }
                wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) );
                return $checkboxes;