Consistant error for groups that dont exist in API

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index a822d18dddc64fce890cd09c54d0e8af9e6ad9de..08348e97bd4306bc0e745243355a12783f865f85 100644 (file)
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -92,7 +92,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index ffda3986ff0808e9de6d15df72f391aea8dad471..b531d95015a8fd19af7cdb02303da407f75c1e23 100644 (file)
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -101,7 +101,7 @@ class ApiGroupJoinAction extends ApiAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 8665ea1aa81f28b45cb39b28e059067321dda080..514a3a557da4e923dbe419e9cf150607c92cbfe2 100644 (file)
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -101,7 +101,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 

diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index d221a64183473c086f9c14ede6a35fe122a905af..dd2843161ac13668db300a9ce00cd6a1b3b2f8e6 100644 (file)
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -87,6 +87,11 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
     {
         parent::handle($args);
 
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
         // XXX: RSS and Atom
 
         switch($this->format) {

diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index b745ff92f6aff0223f63115b4141d3ff9b78a307..f9b960747b2336baaeb8bb06c778d03b386eeeb2 100644 (file)
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -87,7 +87,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
 
         if (empty($this->group)) {
             $this->clientError(
-                'Group not found!',
+                _('Group not found!'),
                 404,
                 $this->format
             );

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index f25f6ba513d76b6ad85aa129be18dc3f4ffaabfb..de13e7eb9871b95c3ed5d90b869aa236db08e200 100644 (file)
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
         parent::prepare($args);
 
         $this->group   = $this->getTargetGroup($this->arg('id'));
-        $this->notices = $this->getNotices();
 
         return true;
     }
@@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
     function handle($args)
     {
         parent::handle($args);
+
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
+        $this->notices = $this->getNotices();
         $this->showTimeline();
     }