X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..8a4706fdeb1ae30268e510df6ccf3c39b3028059:/wp-includes/ms-deprecated.php
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index a7f7eb23..9b9c43f9 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -49,7 +49,7 @@ function is_site_admin( $user_login = '' ) {
return false;
} else {
$user = get_user_by( 'login', $user_login );
- if ( empty( $user->ID ) )
+ if ( ! $user->exists() )
return false;
$user_id = $user->ID;
}
@@ -68,7 +68,7 @@ function graceful_fail( $message ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
$message = apply_filters( 'graceful_fail', $message );
$message_template = apply_filters( 'graceful_fail_template',
-'
+'
Error!
@@ -200,4 +200,73 @@ function get_most_active_blogs( $num = 10, $display = true ) {
}
return array_slice( $most_active, 0, $num );
}
-?>
+
+/**
+ * Redirect a user based on $_GET or $_POST arguments.
+ *
+ * The function looks for redirect arguments in the following order:
+ * 1) $_GET['ref']
+ * 2) $_POST['ref']
+ * 3) $_SERVER['HTTP_REFERER']
+ * 4) $_GET['redirect']
+ * 5) $_POST['redirect']
+ * 6) $url
+ *
+ * @since MU
+ * @deprecated 3.3.0
+ * @deprecated Use wp_redirect()
+ * @uses wpmu_admin_redirect_add_updated_param()
+ *
+ * @param string $url
+ */
+function wpmu_admin_do_redirect( $url = '' ) {
+ _deprecated_function( __FUNCTION__, '3.3' );
+
+ $ref = '';
+ if ( isset( $_GET['ref'] ) )
+ $ref = $_GET['ref'];
+ if ( isset( $_POST['ref'] ) )
+ $ref = $_POST['ref'];
+
+ if ( $ref ) {
+ $ref = wpmu_admin_redirect_add_updated_param( $ref );
+ wp_redirect( $ref );
+ exit();
+ }
+ if ( empty( $_SERVER['HTTP_REFERER'] ) == false ) {
+ wp_redirect( $_SERVER['HTTP_REFERER'] );
+ exit();
+ }
+
+ $url = wpmu_admin_redirect_add_updated_param( $url );
+ if ( isset( $_GET['redirect'] ) ) {
+ if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
+ $url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
+ } elseif ( isset( $_POST['redirect'] ) ) {
+ $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
+ }
+ wp_redirect( $url );
+ exit();
+}
+
+/**
+ * Adds an 'updated=true' argument to a URL.
+ *
+ * @since MU
+ * @deprecated 3.3.0
+ * @deprecated Use add_query_arg()
+ *
+ * @param string $url
+ * @return string
+ */
+function wpmu_admin_redirect_add_updated_param( $url = '' ) {
+ _deprecated_function( __FUNCTION__, '3.3' );
+
+ if ( strpos( $url, 'updated=true' ) === false ) {
+ if ( strpos( $url, '?' ) === false )
+ return $url . '?updated=true';
+ else
+ return $url . '&updated=true';
+ }
+ return $url;
+}