<!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>[12827] trunk/wp-includes: Deprecate graceful_fail().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12827">12827</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-25 22:09:43 +0000 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate graceful_fail(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.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>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12826 => 12827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-25 22:01:43 UTC (rev 12826)
+++ trunk/wp-includes/functions.php 2010-01-25 22:09:43 UTC (rev 12827)
</span><span class="lines">@@ -2504,7 +2504,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @private
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $message Error message.
</span><span class="cx"> * @param string $title Error title.
</span><span class="cx"> * @param string|array $args Optional arguements to control behaviour.
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (12826 => 12827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-01-25 22:01:43 UTC (rev 12826)
+++ trunk/wp-includes/ms-deprecated.php 2010-01-25 22:09:43 UTC (rev 12827)
</span><span class="lines">@@ -56,4 +56,39 @@
</span><span class="cx"> return is_super_admin( $user_id );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( !function_exists('graceful_fail') ) :
+/**
+ * @deprecated 3.0
+ */
+function graceful_fail( $message ) {
+ _deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
+ $message = apply_filters('graceful_fail', $message);
+ $message_template = apply_filters( 'graceful_fail_template',
+'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Error!</title>
+<style type="text/css">
+img {
+ border: 0;
+}
+body {
+line-height: 1.6em; font-family: Georgia, serif; width: 390px; margin: auto;
+text-align: center;
+}
+.message {
+ font-size: 22px;
+ width: 350px;
+ margin: auto;
+}
+</style>
+</head>
+<body>
+<p class="message">%s</p>
+</body>
+</html>' );
+ die( sprintf( $message_template, $message ) );
+}
+endif;
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12826 => 12827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-25 22:01:43 UTC (rev 12826)
+++ trunk/wp-includes/ms-functions.php 2010-01-25 22:09:43 UTC (rev 12827)
</span><span class="lines">@@ -1766,37 +1766,6 @@
</span><span class="cx"> return $size; // default
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( !function_exists('graceful_fail') ) :
-function graceful_fail( $message ) {
- $message = apply_filters('graceful_fail', $message);
- $message_template = apply_filters( 'graceful_fail_template',
-'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Error!</title>
-<style type="text/css">
-img {
- border: 0;
-}
-body {
-line-height: 1.6em; font-family: Georgia, serif; width: 390px; margin: auto;
-text-align: center;
-}
-.message {
- font-size: 22px;
- width: 350px;
- margin: auto;
-}
-</style>
-</head>
-<body>
-<p class="message">%s</p>
-</body>
-</html>' );
- die( sprintf( $message_template, $message ) );
-}
-endif;
-
</del><span class="cx"> /* Delete blog */
</span><span class="cx"> class delete_blog {
</span><span class="cx"> function delete_blog() {
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12826 => 12827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-01-25 22:01:43 UTC (rev 12826)
+++ trunk/wp-includes/ms-load.php 2010-01-25 22:09:43 UTC (rev 12827)
</span><span class="lines">@@ -91,26 +91,24 @@
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-deleted.php';
</span><span class="cx"> } else {
</span><span class="cx"> header('HTTP/1.1 410 Gone');
</span><del>- graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
</del><ins>+ wp_die(__('This user has elected to delete their account and the content is no longer available.'));
</ins><span class="cx"> }
</span><ins>+ } elseif ( '2' == $current_blog->deleted ) {
+ if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
+ return WP_CONTENT_DIR . '/blog-inactive.php';
+ else
+ wp_die( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, 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><del>- if ( '2' == $current_blog->deleted ) {
- if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
- return WP_CONTENT_DIR . '/blog-inactive.php';
- } else {
- graceful_fail( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
- }
- }
-
- if( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
</del><ins>+ if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
</ins><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-suspended.php';
</span><span class="cx"> } else {
</span><span class="cx"> header('HTTP/1.1 410 Gone');
</span><del>- graceful_fail(__('This blog has been archived or suspended.'));
</del><ins>+ wp_die(__('This blog has been archived or suspended.'));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>