Ticket #43441: 43441.diff

Gruntfile.js

@@ -1127 +1127 @@
                                 files: [
                                         SOURCE_DIR + '**',
                                         '!' + SOURCE_DIR + 'js/**/*.js',
+                                        '!' + SOURCE_DIR + 'wp-content/**',
                                         // Ignore version control directories.
                                         '!' + SOURCE_DIR + '**/.{svn,git}/**'
                                 ],

src/wp-admin/includes/dashboard.php

@@ -1094 +1094 @@
  * @return bool True on success, false on failure.
  */
 function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array(), ...$args ) {
+        /*
+        always show the latest new item
+        if the 2nd was published less than 7-10 days ago, show it too
+        */
+
         $loading    = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&hellip;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
         $doing_ajax = wp_doing_ajax();
 
@@ -1108 +1113 @@
 
         $locale    = get_user_locale();
         $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
+
         $output    = get_transient( $cache_key );
         if ( false !== $output ) {
                 echo $output;
@@ -1419 +1425 @@
  *
  * @since 2.7.0
  * @since 4.8.0 Removed popular plugins feed.
+ * @since todo 2nd news item conditionally displayed, if so then planet item removed
  */
 function wp_dashboard_primary() {
         $feeds = array(
@@ -1441 +1448 @@
                          * @param string $url The widget's primary feed URL.
                          */
                         'url'          => apply_filters( 'dashboard_primary_feed', __( 'https://wordpress.org/news/feed/' ) ),
+                                // save to constant to make DRY?
 
                         /**
                          * Filters the primary link title for the 'WordPress Events and News' dashboard widget.
@@ -1450 +1458 @@
                          * @param string $title Title attribute for the widget's primary link.
                          */
                         'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
-                        'items'        => 1,
+'items'        => 1, // leave at one to test condition
+//                      'items'        => 2,
                         'show_summary' => 0,
                         'show_author'  => 0,
                         'show_date'    => 0,
@@ -1511 +1520 @@
  * @param array  $feeds     Array of RSS feeds.
  */
 function wp_dashboard_primary_output( $widget_id, $feeds ) {
+        add_action( 'wp_feed_post_init', '_wp_dashboard_add_extra_news_item', 10, 2 );
+                // needs to be all time because of ajax? doesn't need to run when cached, just when savings
+
         foreach ( $feeds as $type => $args ) {
                 $args['type'] = $type;
                 echo '<div class="rss-widget">';
+                        // or maybe don't call this function, and instead call fetch_feed() yourself?
                         wp_widget_rss_output( $args['url'], $args );
                 echo '</div>';
         }
+
+        remove_action( 'wp_feed_post_init', '_wp_dashboard_add_extra_news_item', 10 );
+}
+
+
+function _wp_dashboard_add_extra_news_item( $feed, $url ) {
+        // if wrong url, return
+        if ( __( 'https://wordpress.org/news/feed/' ) !== $url ) {
+                return;
+        }
+
+        var_dump($feed);wp_die();
+        // just modify public data or raw_data?
+        // or use accessor functions?
+
+        // make sure passing by reference
+
+
+        // if 2nd item has been displayed for 7+ days already, then remove it
+
+        // but also need to need to edit the planet feed to make remove one of theirs, so would need some kind of global variable to track that
+        // this architecture is so not straightforward, maybe refactor it instead
+        // top level function should call model to get array of items, then modify it, then pass it to function to render it
 }
 
 /**

src/wp-admin/includes/upgrade.php

@@ -2202 +2202 @@
         }
 }
 
+// need to flush cache during upgrade, otherwise will get errors b/c code expects 2 but there's only 1?
+        // prob. just delete the transient
+$cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
+// need to do for all locales. so sql query to delete where LIKE ?
+// but object cache
+// maybe simpler to just have code check if there's a 2nd
+// or do all transients get cleared during upgrade anyway?
+
 /**
  * Executes network-level upgrade routines.
  *

src/wp-includes/feed.php

@@ -821 +821 @@
         $feed->init();
         $feed->set_output_encoding( get_option( 'blog_charset' ) );
 
+        // add action here, so can modify the results?
+
+        do_action_ref_array( 'wp_feed_post_init', array( &$feed, $url ) );
+
         if ( $feed->error() ) {
                 return new WP_Error( 'simplepie-error', $feed->error() );
         }

src/wp-includes/widgets.php

@@ -1528 +1528 @@
                 return;
         }
 
+        // could maybe assign get_items() to a var, and filter that. that might be cleanest.
+        // although, if gonna add a filter, might as well do it higher up so it's useful to more people
+
         echo '<ul>';
         foreach ( $rss->get_items( 0, $items ) as $item ) {
                 $link = $item->get_link();