From 340e129deb561adba466f12f895f378f8710ec76 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Thu, 19 Sep 2013 08:40:10 +0000
Subject: [PATCH] Upgrader: Fix the order of arguements passed to
 wp_parse_args() in the Upgrader, introduced with [25272]. See #22704

Built from https://develop.svn.wordpress.org/trunk@25495


git-svn-id: http://core.svn.wordpress.org/trunk@25416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-upgrader.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 181c472fc7..beb2e2d21a 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -430,7 +430,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->install_strings();
@@ -463,7 +463,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->upgrade_strings();
@@ -514,7 +514,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->bulk = true;
@@ -802,7 +802,7 @@ class Theme_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->install_strings();
@@ -836,7 +836,7 @@ class Theme_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->upgrade_strings();
@@ -886,7 +886,7 @@ class Theme_Upgrader extends WP_Upgrader {
 		$defaults = array(
 			'clear_update_cache' => true,
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->bulk = true;
@@ -1096,7 +1096,7 @@ class Core_Upgrader extends WP_Upgrader {
 
 		$defaults = array(
 		);
-		$parsed_args = wp_parse_args( $defaults, $args );
+		$parsed_args = wp_parse_args( $args, $defaults );
 
 		$this->init();
 		$this->upgrade_strings();