Refactor RSS widgets caching in WordPress adapter

Removes the class property and caching of RSS widgets, making get_rss_widgets() always return a fresh list. This simplifies the logic and ensures the latest widgets are always retrieved.

Author: pfefferle

includes/adapters/class-wordpress.php

@@ -37,13 +37,6 @@ class WordPress extends Adapter {
 	 */
 	protected $news_feed = 'https://wordpress.org/news/feed/';
 
-	/**
-	 * Cached dashboard RSS widgets.
-	 *
-	 * @var array|null
-	 */
-	protected $rss_widgets = null;
-
 	/**
 	 * Get list of channels.
 	 *
@@ -434,11 +427,7 @@ protected function fetch_events_via_api( $limit, $location ) {
 	 * @return array
 	 */
 	protected function get_rss_widgets() {
-		if ( null !== $this->rss_widgets ) {
-			return $this->rss_widgets;
-		}
-
-		$this->rss_widgets = array();
+		$widgets = array();
 
 		/**
 		 * Filter to register dashboard RSS feeds with Microsub.
@@ -452,7 +441,7 @@ protected function get_rss_widgets() {
 		if ( \is_array( $plugin_feeds ) ) {
 			foreach ( $plugin_feeds as $feed ) {
 				if ( ! empty( $feed['id'] ) && ! empty( $feed['url'] ) ) {
-					$this->rss_widgets[] = array(
+					$widgets[] = array(
 						'id'   => $feed['id'],
 						'name' => ! empty( $feed['name'] ) ? $feed['name'] : $feed['id'],
 						'url'  => $feed['url'],
@@ -464,38 +453,36 @@ protected function get_rss_widgets() {
 		// Also check dashboard_widget_options for user-added RSS widgets.
 		$options = \get_option( 'dashboard_widget_options', array() );
 
-		if ( ! \is_array( $options ) ) {
-			return $this->rss_widgets;
-		}
-
-		foreach ( $options as $widget_id => $settings ) {
-			if ( ! \is_array( $settings ) ) {
-				continue;
-			}
+		if ( \is_array( $options ) ) {
+			foreach ( $options as $widget_id => $settings ) {
+				if ( ! \is_array( $settings ) ) {
+					continue;
+				}
 
-			// Check for feed URL in common keys.
-			$url = null;
-			if ( ! empty( $settings['url'] ) ) {
-				$url = $settings['url'];
-			} elseif ( ! empty( $settings['link'] ) && \filter_var( $settings['link'], \FILTER_VALIDATE_URL ) ) {
-				// 'link' is sometimes the feed URL in older widgets.
-				$url = $settings['link'];
-			}
+				// Check for feed URL in common keys.
+				$url = null;
+				if ( ! empty( $settings['url'] ) ) {
+					$url = $settings['url'];
+				} elseif ( ! empty( $settings['link'] ) && \filter_var( $settings['link'], \FILTER_VALIDATE_URL ) ) {
+					// 'link' is sometimes the feed URL in older widgets.
+					$url = $settings['link'];
+				}
 
-			if ( ! $url ) {
-				continue;
-			}
+				if ( ! $url ) {
+					continue;
+				}
 
-			$title = ! empty( $settings['title'] ) ? $settings['title'] : $widget_id;
+				$title = ! empty( $settings['title'] ) ? $settings['title'] : $widget_id;
 
-			$this->rss_widgets[] = array(
-				'id'   => $widget_id,
-				'name' => $title,
-				'url'  => $url,
-			);
+				$widgets[] = array(
+					'id'   => $widget_id,
+					'name' => $title,
+					'url'  => $url,
+				);
+			}
 		}
 
-		return $this->rss_widgets;
+		return $widgets;
 	}
 
 	/**