Remove call to deprecated $wgOut->includeJQuery();

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a334a89..0c9be60 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -136,7 +136,6 @@ class EditPage {
                $undoafter = $wgRequest->getVal( 'undoafter' );
                $undo = $wgRequest->getVal( 'undo' );
 
-               $text = '';
                // For message page not locally set, use the i18n message.
                // For other non-existent articles, use preload text if any.
                if ( !$this->mTitle->exists() ) {
@@ -321,7 +320,6 @@ class EditPage {
                $wgOut->addModules( 'mediawiki.legacy.edit' );
 
                if ( $wgUser->getOption( 'uselivepreview', false ) ) {
-                       $wgOut->includeJQuery();
                        $wgOut->addModules( 'mediawiki.legacy.preview' );
                }
 
@@ -1079,7 +1077,7 @@ class EditPage {
                        ),
                        __METHOD__,
                        array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ) );
-               while( $row = $res->fetchObject() ) {
+               foreach ( $res as $row ) {
                        if( $row->rev_user != $id ) {
                                return false;
                        }
@@ -1275,11 +1273,11 @@ HTML
                # automatic one and pass that in the hidden field wpAutoSummary.
                if ( $this->missingSummary ||
                        ( $this->section == 'new' && $this->nosummary ) )
-                               $wgOut->addHTML( Xml::hidden( 'wpIgnoreBlankSummary', true ) );
+                               $wgOut->addHTML( Html::hidden( 'wpIgnoreBlankSummary', true ) );
                $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
-               $wgOut->addHTML( Xml::hidden( 'wpAutoSummary', $autosumm ) );
+               $wgOut->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) );
 
-               $wgOut->addHTML( Xml::hidden( 'oldid', $this->mArticle->getOldID() ) );
+               $wgOut->addHTML( Html::hidden( 'oldid', $this->mArticle->getOldID() ) );
 
                if ( $this->section == 'new' ) {
                        $this->showSummaryInput( true, $this->summary );
@@ -1568,7 +1566,7 @@ HTML
 HTML
                );
                if ( !$this->checkUnicodeCompliantBrowser() )
-                       $wgOut->addHTML(Xml::hidden( 'safemode', '1' ));
+                       $wgOut->addHTML(Html::hidden( 'safemode', '1' ));
        }
 
        protected function showFormAfterText() {
@@ -1585,7 +1583,7 @@ HTML
                 * include the constant suffix to prevent editing from
                 * broken text-mangling proxies.
                 */
-               $wgOut->addHTML( "\n" . Xml::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" );
+               $wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->editToken() ) . "\n" );
        }
 
        /**