From: Derick Alangi <alangiderick@gmail.com>
Date: Mon, 25 Mar 2019 13:27:22 +0000 (+0100)
Subject: rcfeed: Avoid extending/inheriting from a deprecated class
X-Git-Tag: 1.34.0-rc.0~2379^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=82d4947fcb39f2fcf282ea84d38c97636aea06db;p=lhc%2Fweb%2Fwiklou.git

rcfeed: Avoid extending/inheriting from a deprecated class

Also, fix if...else syntax with return statement in the if block.

Change-Id: If14f0835731f264622cf90fcfd5c7cc850f63050
---

diff --git a/includes/rcfeed/RedisPubSubFeedEngine.php b/includes/rcfeed/RedisPubSubFeedEngine.php
index 8a3aa0c104..c954df1a5b 100644
--- a/includes/rcfeed/RedisPubSubFeedEngine.php
+++ b/includes/rcfeed/RedisPubSubFeedEngine.php
@@ -37,7 +37,7 @@
  *
  * @since 1.22
  */
-class RedisPubSubFeedEngine extends RCFeedEngine {
+class RedisPubSubFeedEngine extends FormattedRCFeed {
 
 	/**
 	 * @see FormattedRCFeed::send
@@ -68,8 +68,8 @@ class RedisPubSubFeedEngine extends RCFeedEngine {
 		if ( $conn !== false ) {
 			$conn->publish( $channel, $line );
 			return true;
-		} else {
-			return false;
 		}
+
+		return false;
 	}
 }