http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55476

Revision: 55476
Author:   nikerabbit
Date:     2009-08-22 12:13:39 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Fix double escapings, styles still broken for ajax edit

Modified Paths:
--------------
    trunk/extensions/Translate/utils/TranslationEditPage.php
    trunk/extensions/Translate/utils/TranslationHelpers.php

Modified: trunk/extensions/Translate/utils/TranslationEditPage.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationEditPage.php    2009-08-22 
12:12:43 UTC (rev 55475)
+++ trunk/extensions/Translate/utils/TranslationEditPage.php    2009-08-22 
12:13:39 UTC (rev 55476)
@@ -48,7 +48,7 @@
                        'class' => 'mw-translate-edit-area',
                        'rows' =>  $short ? 2: 10,
                );
-               $textarea = Html::element( 'textarea', $textareaParams, 
htmlspecialchars($translation) );
+               $textarea = Html::element( 'textarea', $textareaParams, 
$translation );
 
                $hidden = array();
                $hidden[] = Xml::hidden( 'title', 
$this->getTitle()->getPrefixedDbKey() );
@@ -68,7 +68,7 @@
                        'method' => 'post',
                );
 
-               $form = Html::element( 'form', $formParams,
+               $form = Html::rawElement( 'form', $formParams,
                        implode( "\n", $hidden ) . "\n" .
                        $helpers->getBoxes() . "\n" .
                        "$textarea\n$summary$save"

Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php     2009-08-22 
12:12:43 UTC (rev 55475)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php     2009-08-22 
12:13:39 UTC (rev 55476)
@@ -114,7 +114,7 @@
                }
 
                if ( count($boxes) ) {
-                       return Html::element( 'div', array( 'class' => 
'mw-sp-translate-edit-fields' ), implode( "\n\n", $boxes ) );
+                       return Html::rawElement( 'div', array( 'class' => 
'mw-sp-translate-edit-fields' ), implode( "\n\n", $boxes ) );
                } else {
                        throw new MWException( "no boxes" );
                }
@@ -152,7 +152,7 @@
 
                                $text = 
TranslateUtils::convertWhiteSpaceToHTML( $text );
                                $params = array( 'class' => 
'mw-sp-translate-edit-tmsug', 'title' => $s['source'] );
-                               $boxes[] = Html::element( 'div', $params, 
self::legend( $label ) . $text . self::clear() );
+                               $boxes[] = Html::rawElement( 'div', $params, 
self::legend( $label ) . $text . self::clear() );
                        }
                }
 
@@ -187,7 +187,7 @@
                        wfMsg( 'word-separator') .
                        wfMsg( 'parentheses', $title );
 
-               $msg = Html::element( 'span',
+               $msg = Html::rawElement( 'span',
                        array( 'class' => 'mw-translate-edit-deftext' ),
                        TranslateUtils::convertWhiteSpaceToHTML( $en )
                );
@@ -255,7 +255,7 @@
 
                        $text = TranslateUtils::convertWhiteSpaceToHTML( $text 
);
                        $params = array( 'class' => 'mw-translate-edit-item' );
-                       $boxes[] = Html::element( 'div', $params, self::legend( 
$label ) . $text . self::clear() );
+                       $boxes[] = Html::rawElement( 'div', $params, 
self::legend( $label ) . $text . self::clear() );
                }
 
                if ( count($boxes) ) {
@@ -309,7 +309,7 @@
        }
 
        protected static function legend( $label ) {
-               return Html::element( 'div', array( 'class' => 
'mw-translate-legend' ), $label );
+               return Html::rawElement( 'div', array( 'class' => 
'mw-translate-legend' ), $label );
        }
 
        protected static function clear() {



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to