summaryrefslogtreecommitdiff
path: root/actions/twitapiaccount.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-14 00:23:48 +0000
committerZach Copley <zach@controlyourself.ca>2009-06-14 00:23:48 +0000
commitd0eb2058a519941e205f7b0960d9a5e0707207bb (patch)
tree37ed1aa1be3c3a7a58463964ce602565c79f8cdf /actions/twitapiaccount.php
parenta887d4fe8b1f5e5adc2d701384acf50cf2cf54c3 (diff)
parentdbbb3a4fb558ee4372e157612f3e053a87a53a8e (diff)
Merge branch '0.8.x' into userdesign
Conflicts: actions/showfavorites.php lib/action.php
Diffstat (limited to 'actions/twitapiaccount.php')
-rw-r--r--actions/twitapiaccount.php19
1 files changed, 9 insertions, 10 deletions
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 8b956f897..b5e7b91da 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+ exit(1);
+}
require_once(INSTALLDIR.'/lib/twitterapi.php');
@@ -51,7 +53,8 @@ class TwitapiaccountAction extends TwitterapiAction
parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
+ $this->clientError(_('This method requires a POST.'),
+ 400, $apidata['content-type']);
return;
}
@@ -60,24 +63,20 @@ class TwitapiaccountAction extends TwitterapiAction
if (!is_null($location) && mb_strlen($location) > 255) {
// XXX: But Twitter just truncates and runs with it. -- Zach
- $this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
+ $this->clientError(_('That\'s too long. Max notice size is 255 chars.'),
+ 406, $apidate['content-type']);
return;
}
- $user = $apidata['user'];
+ $user = $apidata['user']; // Always the auth user
$profile = $user->getProfile();
- if (!$profile) {
- $this->serverError(_('User has no profile.'));
- return;
- }
-
$orig_profile = clone($profile);
$profile->location = $location;
$result = $profile->update($orig_profile);
- if (!$result) {
+ if (empty($result)) {
common_log_db_error($profile, 'UPDATE', __FILE__);
$this->serverError(_('Couldn\'t save profile.'));
return;