WP Merge to rev 8216

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

1 files changed, 4 insertions, 0 deletions

diff --git a/wp-app.php b/wp-app.php
index 607bed3..35fff3a 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -195,6 +195,10 @@ class AtomServer {
 			$this->redirect($this->get_service_url());
 		}
 
+		// check to see if AtomPub is enabled
+		if( !get_option( 'enable_app' ) )
+			$this->not_allowed( 'AtomPub services are disabled on this blog.  An admin user can enable them at ' . admin_url('options-writing.php') );
+
 		// dispatch
 		foreach($this->selectors as $regex => $funcs) {
 			if(preg_match($regex, $path, $matches)) {