<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12854] trunk: Remove first page and first comment filters.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12854">12854</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 20:42:37 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove first page and first comment filters. They're no longer needed. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12853 => 12854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-01-26 20:25:34 UTC (rev 12853)
+++ trunk/wp-admin/includes/upgrade.php 2010-01-26 20:42:37 UTC (rev 12854)
</span><span class="lines">@@ -193,30 +193,28 @@
</span><span class="cx"> $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
</span><span class="cx">
</span><span class="cx"> // Default comment
</span><ins>+ $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.');
</ins><span class="cx"> if ( is_multisite() ) {
</span><del>- $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.');
- }
</del><ins>+ $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 );
+ }
</ins><span class="cx"> $wpdb->insert( $wpdb->comments, array(
</span><span class="cx"> 'comment_post_ID' => 1,
</span><span class="cx"> 'comment_author' => $first_comment_author,
</span><span class="cx"> 'comment_author_email' => '',
</span><del>- 'comment_author_url' => 'http://wordpress.org/',
</del><ins>+ 'comment_author_url' => $first_comment_url,
</ins><span class="cx"> 'comment_date' => $now,
</span><span class="cx"> 'comment_date_gmt' => $now_gmt,
</span><span class="cx"> 'comment_content' => $first_comment
</span><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> // First Page
</span><del>- 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.');
</del><ins>+ $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 );
</ins><span class="cx"> $first_post_guid = get_option('home') . '/?page_id=2';
</span><span class="cx"> $wpdb->insert( $wpdb->posts, array(
</span><span class="cx"> 'post_author' => $user_id,
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12853 => 12854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-26 20:25:34 UTC (rev 12853)
+++ trunk/wp-includes/functions.php 2010-01-26 20:42:37 UTC (rev 12854)
</span><span class="lines">@@ -417,6 +417,8 @@
</span><span class="cx">
</span><span class="cx"> if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
</span><span class="cx"> $alloptions = wp_cache_get( 'alloptions', 'options' );
</span><ins>+ else
+ $alloptions = false;
</ins><span class="cx">
</span><span class="cx"> if ( !$alloptions ) {
</span><span class="cx"> $suppress = $wpdb->suppress_errors();
</span><span class="lines">@@ -429,6 +431,7 @@
</span><span class="cx"> if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
</span><span class="cx"> wp_cache_add( 'alloptions', $alloptions, 'options' );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $alloptions;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12853 => 12854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-26 20:25:34 UTC (rev 12853)
+++ trunk/wp-includes/ms-functions.php 2010-01-26 20:42:37 UTC (rev 12854)
</span><span class="lines">@@ -1981,39 +1981,6 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
</span><span class="cx">
</span><del>-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' );
-
</del><span class="cx"> function mu_filter_plugins_list( $active_plugins ) {
</span><span class="cx"> $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>