EBernhardson (WMF) has submitted this change and it was merged.
Change subject: Avoid abstract function errors in php 5.3.3
......................................................................
Avoid abstract function errors in php 5.3.3
Same fix as change I183f96e960 , in a different class.
Bug: 53523
Change-Id: I97ee720c2e987a1686c5c2801b434e1cfd72c13a
---
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..128209e 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/82800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97ee720c2e987a1686c5c2801b434e1cfd72c13a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage <sp...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
