WordPress 4.3 “Billie”

(cherry picked from commit 0606c08b0b)

.gitignore

@@ -19,3 +19,4 @@ clog
 /wordpress-4.2.2.tar.gz
 /wordpress-4.2.3.tar.gz
 /wordpress-4.2.4.tar.gz
+/wordpress-4.3.tar.gz

sources

@@ -1 +1 @@
-844f6a90f31dc33b433828f6c23b80b6  wordpress-4.2.4.tar.gz
+b11dcf18e512e44de5c48415eac9ae00  wordpress-4.3.tar.gz

wordpress-4.3-noupdate.patch

@@ -1,7 +1,18 @@
+diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php
+--- wordpress/wp-admin/includes/admin-filters.php.noupdate	2015-08-26 09:56:30.113424058 +0200
++++ wordpress/wp-admin/includes/admin-filters.php	2015-08-26 09:56:50.729529575 +0200
+@@ -101,7 +101,6 @@ add_action( 'profile_update', 'default_p
+ add_action( 'admin_init', 'wp_plugin_update_rows' );
+ add_action( 'admin_init', 'wp_theme_update_rows'  );
+ 
+-add_action( 'admin_notices', 'update_nag',      3  );
+ add_action( 'admin_notices', 'maintenance_nag', 10 );
+ 
+ add_filter( 'update_footer', 'core_update_footer' );
 diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php
---- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate	2015-04-03 02:18:27.000000000 +0200
-+++ wordpress/wp-admin/includes/class-wp-upgrader.php	2015-04-24 10:33:31.166724612 +0200
-@@ -2142,6 +2142,9 @@ class Core_Upgrader extends WP_Upgrader
+--- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate	2015-07-29 16:57:25.000000000 +0200
++++ wordpress/wp-admin/includes/class-wp-upgrader.php	2015-08-26 09:55:58.269261073 +0200
+@@ -2276,6 +2276,9 @@ class Core_Upgrader extends WP_Upgrader
  			}
  		}
  
@@ -11,7 +22,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp
  		// 1: If we're already on that version, not much point in updating?
  		if ( $offered_ver == $wp_version )
  			return false;
-@@ -2373,7 +2376,7 @@ class WP_Automatic_Updater {
+@@ -2510,7 +2513,7 @@ class WP_Automatic_Updater {
  	 */
  	public function is_disabled() {
  		// Background updates are disabled if you don't want file changes.
@@ -20,19 +31,19 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp
  			return true;
  
  		if ( defined( 'WP_INSTALLING' ) )
-diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php
---- wordpress/wp-admin/includes/update.php.noupdate	2015-04-24 10:37:28.288734495 +0200
-+++ wordpress/wp-admin/includes/update.php	2015-04-24 10:37:46.985814124 +0200
-@@ -211,8 +211,6 @@ function update_nag() {
- 	}
- 	echo "<div class='update-nag'>$msg</div>";
- }
--add_action( 'admin_notices', 'update_nag', 3 );
--add_action( 'network_admin_notices', 'update_nag', 3 );
+diff -up wordpress/wp-admin/includes/ms-admin-filters.php.noupdate wordpress/wp-admin/includes/ms-admin-filters.php
+--- wordpress/wp-admin/includes/ms-admin-filters.php.noupdate	2015-08-26 09:57:03.337594106 +0200
++++ wordpress/wp-admin/includes/ms-admin-filters.php	2015-08-26 09:57:09.398625127 +0200
+@@ -38,5 +38,4 @@ add_action( 'admin_notices',         'si
+ add_action( 'network_admin_notices', 'site_admin_notice' );
  
- // Called directly from dashboard
- function update_right_now_message() {
-@@ -227,7 +225,7 @@ function update_right_now_message() {
+ // Update Hooks
+-add_action( 'network_admin_notices', 'update_nag',      3  );
+ add_action( 'network_admin_notices', 'maintenance_nag', 10 );
+diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php
+--- wordpress/wp-admin/includes/update.php.noupdate	2015-07-07 02:02:24.000000000 +0200
++++ wordpress/wp-admin/includes/update.php	2015-08-26 09:56:00.298271458 +0200
+@@ -251,7 +251,7 @@ function update_right_now_message() {
  		$cur = get_preferred_from_update_core();
  
  		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
@@ -42,9 +53,9 @@ diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/incl
  
  	$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
 diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php
---- wordpress/wp-includes/capabilities.php.noupdate	2015-04-20 09:27:27.000000000 +0200
-+++ wordpress/wp-includes/capabilities.php	2015-04-24 10:33:31.167724617 +0200
-@@ -1281,7 +1281,7 @@ function map_meta_cap( $cap, $user_id )
+--- wordpress/wp-includes/capabilities.php.noupdate	2015-08-14 00:31:24.000000000 +0200
++++ wordpress/wp-includes/capabilities.php	2015-08-26 09:56:00.299271463 +0200
+@@ -1337,7 +1337,7 @@ function map_meta_cap( $cap, $user_id )
  		// Disallow the file editors.
  		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
  			$caps[] = 'do_not_allow';
@@ -53,7 +64,7 @@ diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/c
  			$caps[] = 'do_not_allow';
  		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
  			$caps[] = 'do_not_allow';
-@@ -1299,7 +1299,7 @@ function map_meta_cap( $cap, $user_id )
+@@ -1355,7 +1355,7 @@ function map_meta_cap( $cap, $user_id )
  	case 'update_core':
  		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
  		// Files in uploads are excepted.
@@ -63,9 +74,9 @@ diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/c
  		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
  			$caps[] = 'do_not_allow';
 diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php
---- wordpress/wp-includes/update.php.noupdate	2015-03-18 23:07:28.000000000 +0100
-+++ wordpress/wp-includes/update.php	2015-04-24 10:33:31.167724617 +0200
-@@ -624,9 +624,6 @@ function _maybe_update_themes() {
+--- wordpress/wp-includes/update.php.noupdate	2015-05-28 17:29:28.000000000 +0200
++++ wordpress/wp-includes/update.php	2015-08-26 09:56:00.299271463 +0200
+@@ -636,9 +636,6 @@ function _maybe_update_themes() {
   * @since 3.1.0
   */
  function wp_schedule_update_checks() {
@@ -75,7 +86,7 @@ diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.
  	if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
  		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
  
-@@ -668,8 +665,6 @@ if ( ( ! is_main_site() && ! is_network_
+@@ -680,8 +677,6 @@ if ( ( ! is_main_site() && ! is_network_
  }
  
  add_action( 'admin_init', '_maybe_update_core' );

wordpress.spec

@@ -23,7 +23,7 @@
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
-Version:    4.2.4
+Version:    4.3
 Group:      Applications/Publishing
 Release:    1%{?dist}
 License:    GPLv2
@@ -48,7 +48,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch
 # Adjust mediaelement not to use its SWF and Silverlight plugins. This
 # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
 # 'plugins:["youtube","vimeo"]'
-Patch4: wordpress-4.2-mediaelement-noflash_silverlight.patch
+Patch4: wordpress-4.3-mediaelement-noflash_silverlight.patch
 # RPM configuration:
 # Path to installation
 # Disable auto-updater
@@ -57,7 +57,7 @@ Patch5: wordpress-4.0-config.patch
 # disable version check and updated
 # change DISALLOW_FILE_MODS default value to true
 # ignore WP_AUTO_UPDATE_CORE (always false)
-Patch6: wordpress-4.2-noupdate.patch
+Patch6: wordpress-4.3-noupdate.patch
 # Use system libraries
 Patch7: wordpress-4.0-systemlibs.patch
 
@@ -152,7 +152,7 @@ rm wp-content/plugins/akismet/.htaccess
 #patch1 -p1 -b .rhbz522897
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
 %if %{with_getid3}
 %patch7 -p1
 %endif
@@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Aug 26 2015 Remi Collet <remi@fedoraproject.org> - 4.3-1
+- WordPress 4.3 “Billie”
+
 * Tue Aug  4 2015 Remi Collet <remi@fedoraproject.org> - 4.2.4-1
 - WordPress 4.2.4 Security and Maintenance Release