Merge branch '1.0.x' into feedsub-wizard

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 8d8ab326df249e7fcaf58a218e44312180554d4e..b8927372bb10d1c72e83da54ab66ec052d4944b3 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -78,6 +78,9 @@ class ShownoticeAction extends OwnerDesignAction
     function prepare($args)
     {
         parent::prepare($args);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
 
         $id = $this->arg('notice');
 
@@ -189,7 +192,6 @@ class ShownoticeAction extends OwnerDesignAction
         parent::handle($args);
 
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
             $this->showAjax();
         } else {
             if ($this->notice->is_local == Notice::REMOTE_OMB) {