<!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>[13949] trunk/wp-includes/wp-db.php: have get_blog_prefix()

  default to the prefix of the current blog, see #12820</title>

</head>

<body>

<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13949">13949</a></dd>

<dt>Author</dt> <dd>wpmuguru</dd>

<dt>Date</dt> <dd>2010-04-02 22:47:51 +0000 (Fri, 02 Apr 2010)</dd>

</dl>

<h3>Log Message</h3>

<pre>have get_blog_prefix() default to the prefix of the current blog, see <a href="http://trac.wordpress.org/ticket/12820">#12820</a></pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpincludeswpdbphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13948 => 13949)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/wp-db.php        2010-04-02 22:46:48 UTC (rev 13948)

+++ trunk/wp-includes/wp-db.php        2010-04-02 22:47:51 UTC (rev 13949)

</span><span class="lines">@@ -624,8 +624,10 @@

</span><span class="cx">          * @param int $blog_id Optional.

</span><span class="cx">          * @return string Blog prefix.

</span><span class="cx">          */

</span><del>-        function get_blog_prefix( $blog_id = 0 ) {

-                if ( is_multisite() &amp;&amp; $blog_id ) {

</del><ins>+        function get_blog_prefix( $blog_id = -1 ) {

+                if ( is_multisite() ) {

+                        if ( $blog_id &lt; 0 )

+                                $blog_id = $this-&gt;blogid;

</ins><span class="cx">                         if ( defined( 'MULTISITE' ) &amp;&amp; ( 0 == $blog_id || 1 == $blog_id ) )

</span><span class="cx">                                 return $this-&gt;base_prefix;

</span><span class="cx">                         else

</span><span class="lines">@@ -1577,4 +1579,4 @@

</span><span class="cx">          */

</span><span class="cx">         $wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);

</span><span class="cx"> }

</span><del>-?&gt;

</del><span class="cx">\ No newline at end of file

</span><ins>+?&gt;

</ins></span></pre>

</div>

</div>

</body>

</html>