Changeset 15836

Timestamp:

10/18/2010 06:53:47 PM (16 years ago)

Author:

ryan

Message:

Allow flagging of a blog as mature via a URL. Move some actions into update_blog_status(). Props Viper007Bond. fixes #14385

Location:

trunk

Files:

• wp-admin/network/edit.php (modified) (3 diffs)
• wp-includes/ms-blogs.php (modified) (1 diff)

trunk/wp-admin/network/edit.php

@@ -399 +399 @@
 
                 update_blog_status( $id, 'archived', '1' );
-                do_action( 'archive_blog', $id );
                 wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
                 exit();
@@ -409 +408 @@
                         wp_die( __( 'You do not have permission to access this page.' ) );
 
-                do_action( 'unarchive_blog', $id );
                 update_blog_status( $id, 'archived', '0' );
                 wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
@@ -454 +452 @@
                 update_blog_status( $id, 'spam', '1' );
                 wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
+                exit();
+        break;
+
+        case 'unmatureblog':
+                check_admin_referer( 'unmatureblog' );
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __( 'You do not have permission to access this page.' ) );
+
+                update_blog_status( $id, 'mature', '0' );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
+                exit();
+        break;
+
+        case 'matureblog':
+                check_admin_referer( 'matureblog' );
+                if ( ! current_user_can( 'manage_sites' ) )
+                        wp_die( __( 'You do not have permission to access this page.' ) );
+
+                update_blog_status( $id, 'mature', '1' );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
                 exit();
         break;

trunk/wp-includes/ms-blogs.php

@@ -629 +629 @@
                 refresh_blog_details($blog_id);
 
-        if ( $pref == 'spam' ) {
-                if ( $value == 1 )
-                        do_action( "make_spam_blog", $blog_id );
-                else
-                        do_action( "make_ham_blog", $blog_id );
-        }
+        if ( 'spam' == $pref )
+                ( $value == 1 ) ? do_action( 'make_spam_blog', $blog_id ) :     do_action( 'make_ham_blog', $blog_id );
+        elseif ( 'mature' == $pref )
+                ( $value == 1 ) ? do_action( 'mature_blog', $blog_id ) : do_action( 'unmature_blog', $blog_id );
+        elseif ( 'archived' == $pref )
+                ( $value == 1 ) ? do_action( 'archive_blog', $blog_id ) : do_action( 'unarchive_blog', $blog_id );
+        elseif ( 'archived' == $pref )
+                ( $value == 1 ) ? do_action( 'archive_blog', $blog_id ) : do_action( 'unarchive_blog', $blog_id );
 
         return $value;