set_current_screen() is now unnecessary in Automatic_Upgrader_Skin, which is good because it breaks things in the network admin.

fixes #25622.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-17 23:24:09 +00:00
parent a65661abee
commit 325ccd0a14

View File

@ -599,7 +599,6 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version // TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer // This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
ob_start(); ob_start();
set_current_screen( 'tools' ); // Only here to avoid PHP Notices from screen_icon() which is used within that HTML
$result = parent::request_filesystem_credentials( $error ); $result = parent::request_filesystem_credentials( $error );
ob_end_clean(); ob_end_clean();
return $result; return $result;