From 92cb5936f14b7afd06f6f464cb72e4f8adac617f Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Tue, 3 Feb 2015 06:14:22 +0000
Subject: [PATCH] Remove an unused parameter on install_plugins_upload(). Props
 michalzuber. Fixes #28964

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


git-svn-id: http://core.svn.wordpress.org/trunk@31307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin-install.php | 6 ++----
 wp-includes/version.php              | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 204ea70368..5cb74413ae 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -195,10 +195,8 @@ function install_search_form( $type_selector = true ) {
 /**
  * Upload from zip
  * @since 2.8.0
- *
- * @param integer $page
  */
-function install_plugins_upload( $page = 1 ) {
+function install_plugins_upload() {
 ?>
 <div class="upload-plugin">
 	<p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
@@ -211,7 +209,7 @@ function install_plugins_upload( $page = 1 ) {
 </div>
 <?php
 }
-add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
+add_action('install_plugins_upload', 'install_plugins_upload' );
 
 /**
  * Show a username form for the favorites page
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4f96a488ff..b1cc8fd6c5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31325';
+$wp_version = '4.2-alpha-31326';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.