From 8b9b56f59fb262660e0b4f28160b6646655d0bfb Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremyfelt@git.wordpress.org>
Date: Thu, 9 Jul 2015 16:28:42 +0000
Subject: [PATCH] Avoid PHP notice when attempting to edit a site that does not
 exist.

Show a more explicit error - "The requested site does not exist."

Fixes #32934.


git-svn-id: https://develop.svn.wordpress.org/trunk@33144 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/network/site-info.php     | 4 ++++
 src/wp-admin/network/site-settings.php | 4 ++++
 src/wp-admin/network/site-themes.php   | 4 ++++
 src/wp-admin/network/site-users.php    | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 61fea29850..c245ef34a8 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -42,6 +42,10 @@ if ( ! $id ) {
 }
 
 $details = get_blog_details( $id );
+if ( ! $details ) {
+	wp_die( __( 'The requested site does not exist.' ) );
+}
+
 if ( ! can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
 }
diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php
index 31980eebf8..c29507d0c5 100644
--- a/src/wp-admin/network/site-settings.php
+++ b/src/wp-admin/network/site-settings.php
@@ -39,6 +39,10 @@ if ( ! $id )
 	wp_die( __('Invalid site ID.') );
 
 $details = get_blog_details( $id );
+if ( ! $details ) {
+	wp_die( __( 'The requested site does not exist.' ) );
+}
+
 if ( !can_edit_network( $details->site_id ) )
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
 
diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php
index 0042601bdc..44b6c5bd62 100644
--- a/src/wp-admin/network/site-themes.php
+++ b/src/wp-admin/network/site-themes.php
@@ -56,6 +56,10 @@ if ( ! $id )
 $wp_list_table->prepare_items();
 
 $details = get_blog_details( $id );
+if ( ! $details ) {
+	wp_die( __( 'The requested site does not exist.' ) );
+}
+
 if ( !can_edit_network( $details->site_id ) )
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
 
diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index f29056509f..ae34c4771a 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -49,6 +49,10 @@ if ( ! $id )
 	wp_die( __('Invalid site ID.') );
 
 $details = get_blog_details( $id );
+if ( ! $details ) {
+	wp_die( __( 'The requested site does not exist' ) );
+}
+
 if ( ! can_edit_network( $details->site_id ) )
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );