From 0faa988e91056564b2ae19f045a81b322cce4e0c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 29 Jul 2010 20:31:22 +0000 Subject: Fix for issue ID 2290: make sure errors are returned in the right format, and use callback for errors when the request is JSONP --- lib/apiaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/apiaction.php b/lib/apiaction.php index 7868ecab1..479a86ad8 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -27,7 +27,7 @@ * @author Jeffery To * @author Toby Inkster * @author Zach Copley - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ -- cgit v1.2.3-54-g00ecf From fd530a892fd969f8938d8f7300d348846e684d2f Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 4 Aug 2010 12:30:43 -0700 Subject: Fix for source attribution on notices; it was displaying the code instead of the source name sometimes. --- lib/noticelist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/noticelist.php b/lib/noticelist.php index 17adf3a49..252e1ca90 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -499,7 +499,7 @@ class NoticeListItem extends Widget $ns = $this->notice->getSource(); if ($ns) { - $source_name = _($ns->code); + $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); -- cgit v1.2.3-54-g00ecf