Re-encode in utf-8 and removed trailing whitespaces

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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index dbd275d..0b2b6c5 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1,8 +1,6 @@
 <?php
 if ( ! defined( 'MEDIAWIKI' ) )
        die( 1 );
-/**
- */
 
 /**
  * @todo document
@@ -794,6 +792,10 @@ class OutputPage {
                                $this->addScriptFile( 'mwsuggest.js' );
                        }
                }
+               
+               if( $wgUser->getBoolOption( 'editsectiononrightclick' ) ) {
+                       $this->addScriptFile( 'rightclickedit.js' );
+               }
 
 
                # Buffer output; final headers may depend on later processing
@@ -958,7 +960,7 @@ class OutputPage {
         *
         * @param array $errors Error message keys
         */
-       public function showPermissionsErrorPage( $errors )
+       public function showPermissionsErrorPage( $errors, $action = null )
        {
                global $wgTitle;
 
@@ -971,7 +973,7 @@ class OutputPage {
                $this->enableClientCache( false );
                $this->mRedirect = '';
                $this->mBodytext = '';
-               $this->addWikiText( $this->formatPermissionsErrorMessage( $errors ) );
+               $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) );
        }
 
        /** @deprecated */
@@ -1094,8 +1096,14 @@ class OutputPage {
         * @param array $errors An array of arrays returned by Title::getUserPermissionsErrors
         * @return string The wikitext error-messages, formatted into a list.
         */
-       public function formatPermissionsErrorMessage( $errors ) {
-               $text = wfMsgNoTrans( 'permissionserrorstext', count( $errors ) ) . "\n\n";
+       public function formatPermissionsErrorMessage( $errors, $action = null ) {
+               if ($action == null) {
+                       $text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n";
+               } else {
+                       $action_desc = wfMsg( "right-$action" );
+                       $action_desc[0] = strtolower($action_desc[0]);
+                       $text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n";
+               }
 
                if (count( $errors ) > 1) {
                        $text .= '<ul class="permissions-errors">' . "\n";
@@ -1133,7 +1141,7 @@ class OutputPage {
         * @param bool   $protected Is this a permissions error?
         * @param array  $reasons   List of reasons for this error, as returned by Title::getUserPermissionsErrors().
         */
-       public function readOnlyPage( $source = null, $protected = false, $reasons = array() ) {
+       public function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) {
                global $wgUser, $wgTitle;
                $skin = $wgUser->getSkin();
 
@@ -1154,7 +1162,7 @@ class OutputPage {
                        } else {
                                $this->setPageTitle( wfMsg( 'badaccess' ) );
                        }
-                       $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons ) );
+                       $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ) );
                } else {
                        // Wiki is read only
                        $this->setPageTitle( wfMsg( 'readonly' ) );