Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 20:42:37 +00:00
parent ab33443daf
commit 212533c466
3 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/includes/upgrade.php
View File

@ -193,30 +193,28 @@ function wp_install_defaults($user_id) {
$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
// 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,
'comment_content' => $first_comment
));
// 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(
'post_author' => $user_id,

3
wp-includes/functions.php
View File

@ -417,6 +417,8 @@ function wp_load_alloptions() {
if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
$alloptions = wp_cache_get( 'alloptions', 'options' );
else
$alloptions = false;
if ( !$alloptions ) {
$suppress = $wpdb->suppress_errors();
@ -429,6 +431,7 @@ function wp_load_alloptions() {
if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
wp_cache_add( 'alloptions', $alloptions, 'options' );
}
return $alloptions;
}

33
wp-includes/ms-functions.php
View File

@ -1981,39 +1981,6 @@ Thanks!
}
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' );