WP merge to revision 8283

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1356 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 1 deletions

diff --git a/wp-app.php b/wp-app.php
index 26b8a96..6451094 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -197,7 +197,7 @@ class AtomServer {
 
 		// check to see if AtomPub is enabled
 		if( !get_option( 'enable_app' ) )
-			$this->not_allowed( sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
+			$this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
 
 		// dispatch
 		foreach($this->selectors as $regex => $funcs) {
@@ -939,6 +939,14 @@ list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
 		exit;
 	}
 
+	function forbidden($reason='') {
+		log_app('Status','403: Forbidden');
+		header('Content-Type: text/plain');
+		status_header('403');
+		echo $reason;
+		exit;
+	}
+
 	function not_found() {
 		log_app('Status','404: Not Found');
 		header('Content-Type: text/plain');