dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: c2aa8ba)
Merge "Split ConfiguredReadOnlyMode into own file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 7 Aug 2017 11:00:47 +0000 (11:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 7 Aug 2017 11:00:47 +0000 (11:00 +0000)
includes/Block.php patch | blob | history
includes/EditPage.php patch | blob | history
includes/TrackingCategories.php patch | blob | history

diff --git a/includes/Block.php b/includes/Block.php
index 2ca56a5..8fc2686 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -44,40 +44,40 @@ class Block {
        public $mParentBlockId;
 
        /** @var int */
-       protected $mId;
+       private $mId;
 
        /** @var bool */
-       protected $mFromMaster;
+       private $mFromMaster;
 
        /** @var bool */
-       protected $mBlockEmail;
+       private $mBlockEmail;
 
        /** @var bool */
-       protected $mDisableUsertalk;
+       private $mDisableUsertalk;
 
        /** @var bool */
-       protected $mCreateAccount;
+       private $mCreateAccount;
 
        /** @var User|string */
-       protected $target;
+       private $target;
 
        /** @var int Hack for foreign blocking (CentralAuth) */
-       protected $forcedTargetID;
+       private $forcedTargetID;
 
        /** @var int Block::TYPE_ constant. Can only be USER, IP or RANGE internally */
-       protected $type;
+       private $type;
 
        /** @var User */
-       protected $blocker;
+       private $blocker;
 
        /** @var bool */
-       protected $isHardblock;
+       private $isHardblock;
 
        /** @var bool */
-       protected $isAutoblocking;
+       private $isAutoblocking;
 
        /** @var string|null */
-       protected $systemBlockType;
+       private $systemBlockType;
 
        # TYPE constants
        const TYPE_USER = 1;
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 9d83fbd..cfb78cd 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3225,16 +3225,13 @@ class EditPage {
 
        protected function showFormBeforeText() {
                global $wgOut;
-               $section = htmlspecialchars( $this->section );
-               $wgOut->addHTML( <<<HTML
-<input type='hidden' value="{$section}" name="wpSection"/>
-<input type='hidden' value="{$this->starttime}" name="wpStarttime" />
-<input type='hidden' value="{$this->edittime}" name="wpEdittime" />
-<input type='hidden' value="{$this->editRevId}" name="editRevId" />
-<input type='hidden' value="{$this->scrolltop}" name="wpScrolltop" id="wpScrolltop" />
-
-HTML
-               );
+
+               $wgOut->addHTML( Html::hidden( 'wpSection', htmlspecialchars( $this->section ) ) );
+               $wgOut->addHTML( Html::hidden( 'wpStarttime', $this->starttime ) );
+               $wgOut->addHTML( Html::hidden( 'wpEdittime', $this->edittime ) );
+               $wgOut->addHTML( Html::hidden( 'editRevId', $this->editRevId ) );
+               $wgOut->addHTML( Html::hidden( 'wpScrolltop', $this->scrolltop ) );
+
                if ( !$this->checkUnicodeCompliantBrowser() ) {
                        $wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
                }
@@ -3498,8 +3495,8 @@ HTML
        }
 
        /**
-        * Inserts optional text shown below edit and upload forms. Can be used to offer special characters not present on
-        * most keyboards for copying/pasting.
+        * Inserts optional text shown below edit and upload forms. Can be used to offer special
+        * characters not present on most keyboards for copying/pasting.
         */
        protected function showEditTools() {
                global $wgOut;
diff --git a/includes/TrackingCategories.php b/includes/TrackingCategories.php
index a9ebd76..b3a49c7 100644 (file)
--- a/includes/TrackingCategories.php
+++ b/includes/TrackingCategories.php
@@ -22,6 +22,7 @@
 /**
  * This class performs some operations related to tracking categories, such as creating
  * a list of all such categories.
+ * @since 1.29
  */
 class TrackingCategories {
        /** @var Config */
Wiklou, le Wiki du Wiklou