GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

better error-handling when it's Ajax

This commit is contained in:
Evan Prodromou 2011-04-21 15:25:29 -04:00
parent 963d052653
commit 9a62b7b18f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/Bookmark/newbookmark.php
View File

@ -75,6 +75,10 @@ class NewbookmarkAction extends Action
{
parent::prepare($argarray);
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
}
$this->user = common_current_user();
if (empty($this->user)) {
@ -122,9 +126,6 @@ class NewbookmarkAction extends Action
*/
function newBookmark()
{
if ($this->boolean('ajax')) {
StatusNet::setApi(true);
}
try {
if (empty($this->title)) {
// TRANS: Client exception thrown when trying to create a new bookmark without a title.
@ -148,9 +149,13 @@ class NewbookmarkAction extends Action
$options);
} catch (ClientException $ce) {
$this->error = $ce->getMessage();
$this->showPage();
return;
if ($this->boolean('ajax')) {
throw $ce;
} else {
$this->error = $ce->getMessage();
$this->showPage();
return;
}
}
if ($this->boolean('ajax')) {