Changeset 12854

Timestamp:

01/26/2010 08:42:37 PM (16 years ago)

Author:

ryan

Message:

Remove first page and first comment filters. They're no longer needed. see #11644

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -194 +194 @@
 
     // Default comment
+    $first_comment_author = __('Mr WordPress');
+    $first_comment_url = 'http://wordpress.org/';
+    $first_comment = __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
     if ( is_multisite() ) {
-        $first_comment_author = get_site_option( 'first_comment_author' );
-        $first_comment_url = get_site_option( 'first_comment_url' );
-        $first_comment = get_site_option( 'first_comment' );
-    } else {
-        $first_comment_author = __('Mr WordPress');
-        $first_comment_url = 'http://wordpress.org/';
-        $first_comment = __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
-    }   
+        $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
+        $first_comment_url = get_site_option( 'first_comment_url', 'http://' . $current_site->domain . $current_site->path );
+        $first_comment = get_site_option( 'first_comment', $first_comment );
+    }
     $wpdb->insert( $wpdb->comments, array(
                                 'comment_post_ID' => 1,
                                 'comment_author' => $first_comment_author,
                                 'comment_author_email' => '',
-                                'comment_author_url' => 'http://wordpress.org/',
+                                'comment_author_url' => $first_comment_url,
                                 'comment_date' => $now,
                                 'comment_date_gmt' => $now_gmt,
@@ -214 +213 @@
 
     // First Page
-    if ( is_multisite() && get_site_option( 'first_page' ) )
-        $first_page = get_site_option( 'first_page' );
-    else
-        $first_page = __('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.');
+    $first_page = __('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.');
+    if ( is_multisite() )
+        $first_page = get_site_option( 'first_page', $first_page );
     $first_post_guid = get_option('home') . '/?page_id=2';
     $wpdb->insert( $wpdb->posts, array(

trunk/wp-includes/functions.php

@@ -418 +418 @@
     if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
         $alloptions = wp_cache_get( 'alloptions', 'options' );
+    else
+        $alloptions = false;
 
     if ( !$alloptions ) {
@@ -430 +432 @@
                 wp_cache_add( 'alloptions', $alloptions, 'options' );
     }
+
     return $alloptions;
 }

trunk/wp-includes/ms-functions.php

@@ -1982 +1982 @@
 add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
 
-function first_page_filter( $text ) {
-    if ( !$text )
-        return __( "This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress." );
-
-    return $text;
-}
-add_filter( 'site_option_first_page', 'first_page_filter' );
-
-function first_comment_filter( $text ) {
-    if ( !$text )
-        return __( "This is an example of a WordPress comment, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many comments like this one or sub-comments as you like and manage all of your content inside of WordPress." );
-
-    return $text;
-}
-add_filter( 'site_option_first_comment', 'first_comment_filter' );
-
-function first_comment_author_filter( $text ) {
-    if ( !$text )
-        return __( "Mr WordPress" );
-
-    return $text;
-}
-add_filter( 'site_option_first_comment_author', 'first_comment_author_filter' );
-
-function first_comment_url_filter( $text ) {
-    global $current_site;
-    if ( !$text )
-        return 'http://' . $current_site->domain . $current_site->path;
-
-    return $text;
-}
-add_filter( 'site_option_first_comment_url', 'first_comment_url_filter' );
-
 function mu_filter_plugins_list( $active_plugins ) {
     $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );