Fixed a E_DEPRECATED

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0f90fe..a6a69a8 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -364,7 +364,7 @@ class EditPage {
         * the newly-edited page.
         */
        function edit() {
-               global $wgOut, $wgRequest;
+               global $wgOut, $wgRequest, $wgUser;
                // Allow extensions to modify/prevent this form or submission
                if ( !wfRunHooks( 'AlternateEdit', array( $this ) ) ) {
                        return;
@@ -392,6 +392,13 @@ class EditPage {
                }
 
                $wgOut->addScriptFile( 'edit.js' );
+               
+               if ( $wgUser->getOption( 'uselivepreview', false ) ) {
+                       $wgOut->includeJQuery();
+                       $wgOut->addScriptFile( 'preview.js' );
+               }
+               // Bug #19334: textarea jumps when editing articles in IE8
+               $wgOut->addStyle( 'common/IE80Fixes.css', 'screen', 'IE 8' );
 
                $permErrors = $this->getEditPermissionErrors();
                if ( $permErrors ) {
@@ -758,15 +765,31 @@ class EditPage {
                        $wgOut->wrapWikiMsg( "<div class='mw-editinginterface'>\n$1</div>", 'editinginterface' );
                }
 
-               # Show a warning message when someone creates/edits a user (talk) page but the user does not exists
+               # Show a warning message when someone creates/edits a user (talk) page but the user does not exist
+               # Show log extract when the user is currently blocked
                if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) {
                        $parts = explode( '/', $this->mTitle->getText(), 2 );
                        $username = $parts[0];
                        $id = User::idFromName( $username );
                        $ip = User::isIP( $username );
-                       if ( $id == 0 && !$ip ) {
+                       if ( $id == 0 && !$ip ) { # User does not exist
                                $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n$1</div>",
                                        array( 'userpage-userdoesnotexist', $username ) );
+                       } else if (User::newFromId($id)->isBlocked()) { # Show log extract if the user is currently blocked
+                               LogEventsList::showLogExtract(
+                                       $wgOut,
+                                       'block',
+                                       $this->mTitle->getSubjectPage()->getPrefixedText(),
+                                       '',
+                                       array(
+                                               'lim' => 1,
+                                               'showIfEmpty' => false,
+                                               'msgKey' => array(
+                                                       'sp-contributions-blocked-notice',
+                                                       $this->mTitle->getSubjectPage()->getPrefixedText() # Support GENDER in notice
+                                               )
+                                       )
+                               );
                        }
                }
                # Try to add a custom edit intro, or use the standard one if this is not possible.
@@ -1542,7 +1565,7 @@ HTML
                $inputAttrs = ( is_array($inputAttrs) ? $inputAttrs : array() ) + array(
                        'id' => 'wpSummary',
                        'maxlength' => '200',
-                       'tabindex' => '2',
+                       'tabindex' => '1',
                        'size' => 60,
                        'spellcheck' => 'true',
                );