EBernhardson (WMF) has submitted this change and it was merged.

Change subject: Reviving the lost gerrit patch - 82800
......................................................................


Reviving the lost gerrit patch - 82800

Patch 82800 was merged, but for some reason it's lost and never
appears in Flow git history

Change-Id: I21db2ba139e1a718d5a1e99c9b032eae776a5f8b
---
M includes/Block/Block.php
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  EBernhardson (WMF): Verified; Looks good to me, approved



diff --git a/includes/Block/Block.php b/includes/Block/Block.php
index 168ee92..adab7fc 100644
--- a/includes/Block/Block.php
+++ b/includes/Block/Block.php
@@ -56,9 +56,12 @@
        }
 
        abstract protected function validate();
-       abstract public function render( Templating $templating, array $options 
);
-       abstract public function renderAPI( Templating $templating, array 
$options );
-       abstract public function commit();
+       // These methods exist in the Block interface and as such cannot be 
abstract
+       // until php 5.3.9, but MediaWiki requires PHP version 5.3.2 or later 
(and
+       // some of our test machines are on 5.3.3).
+       //abstract public function render( Templating $templating, array 
$options );
+       //abstract public function renderAPI( Templating $templating, array 
$options );
+       //abstract public function commit();
 
        public function init( $action, $user ) {
                $this->action = $action;

-- 
To view, visit https://gerrit.wikimedia.org/r/84774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I21db2ba139e1a718d5a1e99c9b032eae776a5f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to