dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1893285)
* (bug 26638) Database error pages display correctly in RTL languages
authorNiklas Laxström <nikerabbit@users.mediawiki.org>
Sun, 9 Jan 2011 10:36:13 +0000 (10:36 +0000)
committerNiklas Laxström <nikerabbit@users.mediawiki.org>
Sun, 9 Jan 2011 10:36:13 +0000 (10:36 +0000)
RELEASE-NOTES patch | blob | history
includes/Exception.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46589e4..ac50703 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -65,6 +65,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   pages to be queried via the API and Special:ProtectedPages, and allowing 
   disabling upload protection by removing it from $wgRestrictionTypes.
 * If an edit summary exceeds 250 bytes and is truncated, add an ellipse
+* (bug 26638) Database error pages display correctly in RTL languages
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result
diff --git a/includes/Exception.php b/includes/Exception.php
index 5e7e1ca..76cd641 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -226,7 +226,7 @@ class MWException extends Exception {
         * $wgOut to output the exception.
         */
        function htmlHeader() {
-               global $wgLogo, $wgOutputEncoding;
+               global $wgLogo, $wgOutputEncoding, $wgLang;
 
                if ( !headers_sent() ) {
                        header( 'HTTP/1.0 500 Internal Server Error' );
@@ -236,23 +236,29 @@ class MWException extends Exception {
                        header( 'Pragma: nocache' );
                }
 
-               $logo = htmlspecialchars( $wgLogo, ENT_QUOTES );
-               $title = htmlspecialchars( $this->getPageTitle() );
+               $title = Html::element( 'title', null, $this->getPageTitle() );
 
-               return "<html>
-               <head>
-               <title>$title</title>
-               </head>
-               <body>
-               <h1><img src='$logo' style='float:left;margin-right:1em' alt=''/>$title</h1>
-               ";
+               $left = $wgLang->alignStart();
+               $right = $wgLang->alignEnd();
+               $header = Html::element( 'img', array(
+                       'src' => $wgLogo,
+                       'style' => "float: $left; margin-$right: 1em;",
+                       'alt' => '' ), $this->getPageTitle() );
+
+               $attribs = array( 'dir' => $wgLang->getDir(), 'lang' => $wgLang->getCode() );
+
+               return
+                       Html::htmlHeader( $attribs ) .
+                       Html::rawElement( 'head', null, $title ) . "\n". 
+                       Html::openElement( 'body' ) . "\n" .
+                       Html::rawElement( 'h1', null, $header ) . "\n";
        }
 
        /**
         * print the end of the html page if not using $wgOut.
         */
        function htmlFooter() {
-               return "</body></html>";
+               return Html::closeElement( 'body' ) . Html::closeElement( 'html' );
        }
 
        /**
Wiklou, le Wiki du Wiklou