<!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>[16906] trunk/wp-includes/ms-load.php:
Ensure correct HTTP status code is returned.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16906">16906</a></dd>
<dt>Author</dt> <dd>PeteMall</dd>
<dt>Date</dt> <dd>2010-12-14 08:38:01 +0000 (Tue, 14 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure correct HTTP status code is returned. Props nacin, fixes <a href="http://trac.wordpress.org/ticket/15799">#15799</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (16905 => 16906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-12-14 08:35:48 UTC (rev 16905)
+++ trunk/wp-includes/ms-load.php 2010-12-14 08:38:01 UTC (rev 16906)
</span><span class="lines">@@ -81,28 +81,24 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( '1' == $current_blog->deleted ) {
</span><del>- if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
</del><ins>+ if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
</ins><span class="cx"> return WP_CONTENT_DIR . '/blog-deleted.php';
</span><del>- } else {
- header( 'HTTP/1.1 410 Gone' );
- wp_die( /*WP_I18N_USER_DELETED_BLOG*/'This user has elected to delete their account and the content is no longer available.'/*/WP_I18N_USER_DELETED_BLOG*/ );
- }
</del><ins>+ else
+ wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ), '', array( 'response' => 410 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '2' == $current_blog->deleted ) {
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-inactive.php';
</span><span class="cx"> else
</span><del>- wp_die( sprintf( /*WP_I18N_BLOG_NOT_ACTIVATED*/'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.'/*/WP_I18N_BLOG_NOT_ACTIVATED*/, str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
</del><ins>+ wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
</span><del>- if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
</del><ins>+ if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
</ins><span class="cx"> return WP_CONTENT_DIR . '/blog-suspended.php';
</span><del>- } else {
- header( 'HTTP/1.1 410 Gone' );
- wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
- }
</del><ins>+ else
+ wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>