bug fixes:

* Be sure that article name is escaped when outputing a redirect page
* Mark Xml::buildForm() as static

diff --git a/includes/Article.php b/includes/Article.php
index 55bca1b..6b141b3 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -862,7 +862,7 @@ class Article {
                                if( !$wasRedirected && $this->isCurrent() ) {
                                        $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
                                }
-                               $link = $sk->makeLinkObj( $rt, $rt->getFullText() );
+                               $link = $sk->makeLinkObj( $rt, htmlspecialchars( $rt->getFullText() ) );
 
                                $wgOut->addHTML( '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
                                  '<span class="redirectText">'.$link.'</span>' );

diff --git a/includes/Xml.php b/includes/Xml.php
index 3fe3cb5..d72f49d 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -528,7 +528,7 @@ class Xml {
        * @param string $submitLabel A message containing a label for the submit button.
        * @return string HTML form.
        */
-       function buildForm( $fields, $submitLabel ) {
+       public static function buildForm( $fields, $submitLabel ) {
                $form = '';
                $form .= "<table><tbody>";
        
@@ -545,7 +545,7 @@ class Xml {
        
                $form .= "</tbody></table>";
        
-               $form .= wfSubmitButton( wfMsg($submitLabel) );
+               $form .= Xml::submitButton( wfMsg($submitLabel) );
        
                return $form;
        }