<!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>[15168] trunk/wp-includes: Deprecate get_most_active_blogs()
and get_blog_list().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15168">15168</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-08 13:00:09 +0000 (Tue, 08 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate get_most_active_blogs() and get_blog_list(). Props ocean90. fixes <a href="http://trac.wordpress.org/ticket/13773">#13773</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.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="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (15167 => 15168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2010-06-08 11:04:51 UTC (rev 15167)
+++ trunk/wp-includes/ms-blogs.php 2010-06-08 13:00:09 UTC (rev 15168)
</span><span class="lines">@@ -539,39 +539,4 @@
</span><span class="cx"> return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
- global $wpdb;
-
- $blogs = get_site_option( "blog_list" );
- $update = false;
- if ( is_array( $blogs ) ) {
- if ( ( $blogs['time'] + 60 ) < time() ) { // cache for 60 seconds.
- $update = true;
- }
- } else {
- $update = true;
- }
-
- if ( $update == true ) {
- unset( $blogs );
- $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
-
- foreach ( (array) $blogs as $details ) {
- $blog_list[ $details['blog_id'] ] = $details;
- $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->base_prefix . $details['blog_id'] . "_posts WHERE post_status='publish' AND post_type='post'" );
- }
- unset( $blogs );
- $blogs = $blog_list;
- update_site_option( "blog_list", $blogs );
- }
-
- if ( false == is_array( $blogs ) )
- return array();
-
- if ( $num == 'all' )
- return array_slice( $blogs, $start, count( $blogs ) );
- else
- return array_slice( $blogs, $start, $num );
-}
-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (15167 => 15168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-06-08 11:04:51 UTC (rev 15167)
+++ trunk/wp-includes/ms-deprecated.php 2010-06-08 13:00:09 UTC (rev 15168)
</span><span class="lines">@@ -148,4 +148,21 @@
</span><span class="cx"> return is_email( $email, $check_domain );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * @since MU
+ * @deprecated 3.0.0
+ */
+function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+ return 0;
+}
+
+/**
+ * @since MU
+ * @deprecated 3.0.0
+ */
+function get_most_active_blogs( $num = 10, $display = true ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+ return 0;
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15167 => 15168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-06-08 11:04:51 UTC (rev 15167)
+++ trunk/wp-includes/ms-functions.php 2010-06-08 13:00:09 UTC (rev 15168)
</span><span class="lines">@@ -158,49 +158,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function get_most_active_blogs( $num = 10, $display = true ) {
- $most_active = get_site_option( 'most_active' );
- $update = false;
- if ( is_array( $most_active ) ) {
- if ( ( $most_active['time'] + 60 ) < time() ) { // cache for 60 seconds.
- $update = true;
- }
- } else {
- $update = true;
- }
-
- if ( $update == true ) {
- unset( $most_active );
- $blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
- if ( is_array( $blogs ) ) {
- reset( $blogs );
- foreach ( (array) $blogs as $key => $details ) {
- $most_active[ $details['blog_id'] ] = $details['postcount'];
- $blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
- }
- arsort( $most_active );
- reset( $most_active );
- foreach ( (array) $most_active as $key => $details )
- $t[ $key ] = $blog_list[ $key ];
-
- unset( $most_active );
- $most_active = $t;
- }
- update_site_option( 'most_active', $most_active );
- }
-
- if ( $display == true ) {
- if ( is_array( $most_active ) ) {
- reset( $most_active );
- foreach ( (array) $most_active as $key => $details ) {
- $url = esc_url('http://' . $details['domain'] . $details['path']);
- echo '<li>' . $details['postcount'] . " <a href='$url'>$url</a></li>";
- }
- }
- }
- return array_slice( $most_active, 0, $num );
-}
-
</del><span class="cx"> function get_user_count() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>