<!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" />
<title>[20784] trunk/wp-includes: Call filters for default option values only as needed to reduce number of filter calls.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20784">20784</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-14 17:00:13 +0000 (Mon, 14 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call filters for default option values only as needed to reduce number of filter calls. Props Ott042. see <a href="http://core.trac.wordpress.org/ticket/20448">#20448</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesoptionphp">trunk/wp-includes/option.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (20783 => 20784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-14 16:45:32 UTC (rev 20783)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-14 17:00:13 UTC (rev 20784)
</span><span class="lines">@@ -754,6 +754,77 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Prepares page data for return in an XML-RPC object.
+ *
+ * @access protected
+ *
+ * @param object $page The unprepared page data
+ * @return array The prepared page data
+ */
+ protected function _prepare_page( $page ) {
+ // Get all of the page content and link.
+ $full_page = get_extended( $page->post_content );
+ $link = post_permalink( $page->ID );
+
+ // Get info the page parent if there is one.
+ $parent_title = "";
+ if ( ! empty( $page->post_parent ) ) {
+ $parent = get_page( $page->post_parent );
+ $parent_title = $parent->post_title;
+ }
+
+ // Determine comment and ping settings.
+ $allow_comments = comments_open( $page->ID ) ? 1 : 0;
+ $allow_pings = pings_open( $page->ID ) ? 1 : 0;
+
+ // Format page date.
+ $page_date = $this->_convert_date( $page->post_date );
+ $page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
+
+ // Pull the categories info together.
+ $categories = array();
+ foreach ( wp_get_post_categories( $page->ID ) as $cat_id ) {
+ $categories[] = get_cat_name( $cat_id );
+ }
+
+ // Get the author info.
+ $author = get_userdata( $page->post_author );
+
+ $page_template = get_page_template_slug( $page->ID );
+ if ( empty( $page_template ) )
+ $page_template = 'default';
+
+ $_page = array(
+ 'dateCreated' => $page_date,
+ 'userid' => $page->post_author,
+ 'page_id' => $page->ID,
+ 'page_status' => $page->post_status,
+ 'description' => $full_page['main'],
+ 'title' => $page->post_title,
+ 'link' => $link,
+ 'permaLink' => $link,
+ 'categories' => $categories,
+ 'excerpt' => $page->post_excerpt,
+ 'text_more' => $full_page['extended'],
+ 'mt_allow_comments' => $allow_comments,
+ 'mt_allow_pings' => $allow_pings,
+ 'wp_slug' => $page->post_name,
+ 'wp_password' => $page->post_password,
+ 'wp_author' => $author->display_name,
+ 'wp_page_parent_id' => $page->post_parent,
+ 'wp_page_parent_title' => $parent_title,
+ 'wp_page_order' => $page->menu_order,
+ 'wp_author_id' => (string) $author->ID,
+ 'wp_author_display_name' => $author->display_name,
+ 'date_created_gmt' => $page_date_gmt,
+ 'custom_fields' => $this->get_custom_fields( $page->ID ),
+ 'wp_page_template' => $page_template
+ );
+
+ return apply_filters( 'xmlrpc_prepare_page', $_page, $page );
+ }
+
+ /**
</ins><span class="cx"> * Create a new post for any registered post type.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="lines">@@ -1833,66 +1904,7 @@
</span><span class="cx">
</span><span class="cx"> // If we found the page then format the data.
</span><span class="cx"> if ( $page->ID && ($page->post_type == 'page') ) {
</span><del>- // Get all of the page content and link.
- $full_page = get_extended($page->post_content);
- $link = post_permalink($page->ID);
-
- // Get info the page parent if there is one.
- $parent_title = "";
- if ( !empty($page->post_parent) ) {
- $parent = get_page($page->post_parent);
- $parent_title = $parent->post_title;
- }
-
- // Determine comment and ping settings.
- $allow_comments = comments_open($page->ID) ? 1 : 0;
- $allow_pings = pings_open($page->ID) ? 1 : 0;
-
- // Format page date.
- $page_date = $this->_convert_date( $page->post_date );
- $page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
-
- // Pull the categories info together.
- $categories = array();
- foreach ( wp_get_post_categories($page->ID) as $cat_id ) {
- $categories[] = get_cat_name($cat_id);
- }
-
- // Get the author info.
- $author = get_userdata($page->post_author);
-
- $page_template = get_page_template_slug( $page->ID );
- if ( empty( $page_template ) )
- $page_template = 'default';
-
- $page_struct = array(
- 'dateCreated' => $page_date,
- 'userid' => $page->post_author,
- 'page_id' => $page->ID,
- 'page_status' => $page->post_status,
- 'description' => $full_page['main'],
- 'title' => $page->post_title,
- 'link' => $link,
- 'permaLink' => $link,
- 'categories' => $categories,
- 'excerpt' => $page->post_excerpt,
- 'text_more' => $full_page['extended'],
- 'mt_allow_comments' => $allow_comments,
- 'mt_allow_pings' => $allow_pings,
- 'wp_slug' => $page->post_name,
- 'wp_password' => $page->post_password,
- 'wp_author' => $author->display_name,
- 'wp_page_parent_id' => $page->post_parent,
- 'wp_page_parent_title' => $parent_title,
- 'wp_page_order' => $page->menu_order,
- 'wp_author_id' => (string) $author->ID,
- 'wp_author_display_name' => $author->display_name,
- 'date_created_gmt' => $page_date_gmt,
- 'custom_fields' => $this->get_custom_fields($page_id),
- 'wp_page_template' => $page_template
- );
-
- return($page_struct);
</del><ins>+ return $this->_prepare_page( $page );
</ins><span class="cx"> }
</span><span class="cx"> // If the page doesn't exist indicate that.
</span><span class="cx"> else {
</span><span class="lines">@@ -1935,11 +1947,9 @@
</span><span class="cx"> if ( $num_pages >= 1 ) {
</span><span class="cx"> $pages_struct = array();
</span><span class="cx">
</span><del>- for ( $i = 0; $i < $num_pages; $i++ ) {
- $page = wp_xmlrpc_server::wp_getPage(array(
- $blog_id, $pages[$i]->ID, $username, $password
- ));
- $pages_struct[] = $page;
</del><ins>+ foreach ($pages as $page) {
+ if ( current_user_can( 'edit_page', $page->ID ) )
+ $pages_struct[] = $this->_prepare_page( $page );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return($pages_struct);
</span></span></pre></div>
<a id="trunkwpincludesoptionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/option.php (20783 => 20784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/option.php 2012-05-14 16:45:32 UTC (rev 20783)
+++ trunk/wp-includes/option.php 2012-05-14 17:00:13 UTC (rev 20784)
</span><span class="lines">@@ -44,13 +44,11 @@
</span><span class="cx"> if ( defined( 'WP_SETUP_CONFIG' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $default = apply_filters( 'default_option_' . $option, $default );
-
</del><span class="cx"> if ( ! defined( 'WP_INSTALLING' ) ) {
</span><span class="cx"> // prevent non-existent options from triggering multiple queries
</span><span class="cx"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><span class="cx"> if ( isset( $notoptions[$option] ) )
</span><del>- return $default;
</del><ins>+ return apply_filters( 'default_option_' . $option, $default );
</ins><span class="cx">
</span><span class="cx"> $alloptions = wp_load_alloptions();
</span><span class="cx">
</span><span class="lines">@@ -69,7 +67,7 @@
</span><span class="cx"> } else { // option does not exist, so we must cache its non-existence
</span><span class="cx"> $notoptions[$option] = true;
</span><span class="cx"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><del>- return $default;
</del><ins>+ return apply_filters( 'default_option_' . $option, $default );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -80,7 +78,7 @@
</span><span class="cx"> if ( is_object( $row ) )
</span><span class="cx"> $value = $row->option_value;
</span><span class="cx"> else
</span><del>- return $default;
</del><ins>+ return apply_filters( 'default_option_' . $option, $default );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If home is not set use siteurl.
</span><span class="lines">@@ -756,9 +754,8 @@
</span><span class="cx"> if ( false !== $pre )
</span><span class="cx"> return $pre;
</span><span class="cx">
</span><del>- $default = apply_filters( 'default_site_option_' . $option, $default );
-
- if ( !is_multisite() ) {
</del><ins>+ if ( ! is_multisite() ) {
+ $default = apply_filters( 'default_site_option_' . $option, $default );
</ins><span class="cx"> $value = get_option($option, $default);
</span><span class="cx"> } else {
</span><span class="cx"> $cache_key = "{$wpdb->siteid}:$option";
</span><span class="lines">@@ -774,7 +771,7 @@
</span><span class="cx"> $value = maybe_unserialize( $value );
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx"> } else {
</span><del>- $value = $default;
</del><ins>+ $value = apply_filters( 'default_site_option_' . $option, $default );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>