diff --git a/README b/README index ba0deb2c3d..0c605151b6 100644 --- a/README +++ b/README @@ -618,7 +618,7 @@ subdirectory to add a new language to your system. You'll need to compile the ".po" files into ".mo" files, however. Contributions of translation information to Laconica are very easy: -you can use the Web interface at http://laconi.ca/entrans/ to add one +you can use the Web interface at http://laconi.ca/pootle/ to add one or a few or lots of new translations -- or even new languages. You can also download more up-to-date .po files there, if you so desire. diff --git a/actions/disfavor.php b/actions/disfavor.php index 09b3bf18d3..90bab3ccae 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -89,7 +89,7 @@ class DisfavorAction extends Action } $user->blowFavesCache(); if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Add to favorites')); $this->elementEnd('head'); diff --git a/actions/favor.php b/actions/favor.php index 8ecde4b116..3940df6888 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -89,7 +89,7 @@ class FavorAction extends Action $this->notify($notice, $user); $user->blowFavesCache(); if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Disfavor favorite')); $this->elementEnd('head'); diff --git a/actions/newnotice.php b/actions/newnotice.php index 572adbb239..5142cb5ff2 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -161,7 +161,7 @@ class NewnoticeAction extends Action common_broadcast_notice($notice); if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Notice posted')); $this->elementEnd('head'); diff --git a/actions/nudge.php b/actions/nudge.php index ca7947f5a2..bc3d484788 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -89,7 +89,7 @@ class NudgeAction extends Action $this->notify($user, $other); if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Nudge sent')); $this->elementEnd('head'); diff --git a/actions/subscribe.php b/actions/subscribe.php index 171332734e..f761992de4 100644 --- a/actions/subscribe.php +++ b/actions/subscribe.php @@ -64,7 +64,7 @@ class SubscribeAction extends Action } if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Subscribed')); $this->elementEnd('head'); diff --git a/actions/tagother.php b/actions/tagother.php index 9b06cb43e0..cbace5b6b5 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -203,7 +203,7 @@ class TagotherAction extends Action $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers'; if ($this->boolean('ajax')) { - $this->startHTML('text/xml'); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Tags')); $this->elementEnd('head'); diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index f9dd6f8212..b1e2b64256 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -66,7 +66,7 @@ class UnsubscribeAction extends Action } if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); $this->element('title', null, _('Unsubscribed')); $this->elementEnd('head'); diff --git a/lib/action.php b/lib/action.php index 4d4c3d4c9a..587d2ab13a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -328,8 +328,14 @@ class Action extends HTMLOutputter // lawsuit if ($user) { $this->menuItem(common_local_url('profilesettings'), _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account'); - $this->menuItem(common_local_url('imsettings'), + + if (common_config('xmpp', 'enabled')) { + $this->menuItem(common_local_url('imsettings'), _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect'); + } else { + $this->menuItem(common_local_url('smssettings'), + _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect'); + } $this->menuItem(common_local_url('logout'), _('Logout'), _('Logout from the site'), false, 'nav_logout'); } else { diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php index ef6fd51dff..5019dc06de 100644 --- a/lib/clienterroraction.php +++ b/lib/clienterroraction.php @@ -70,7 +70,7 @@ class ClientErrorAction extends ErrorAction 417 => 'Expectation Failed'); $this->default = 400; } - + // XXX: Should these error actions even be invokable via URI? function handle($args) diff --git a/lib/error.php b/lib/error.php index 9842053d88..03065bc709 100644 --- a/lib/error.php +++ b/lib/error.php @@ -130,6 +130,7 @@ class ErrorAction extends Action { $this->elementStart('div', array('id' => 'header')); $this->showLogo(); + $this->showPrimaryNav(); $this->elementEnd('div'); } diff --git a/lib/servererroraction.php b/lib/servererroraction.php index a398865915..80a3fdd7b4 100644 --- a/lib/servererroraction.php +++ b/lib/servererroraction.php @@ -67,7 +67,7 @@ class ServerErrorAction extends ErrorAction $this->default = 500; } - + // XXX: Should these error actions even be invokable via URI? function handle($args) diff --git a/lib/util.php b/lib/util.php index d7af3f2045..07e124811e 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1390,7 +1390,7 @@ function common_negotiate_type($cprefs, $sprefs) } $bestq = 0; - $besttype = "text/html"; + $besttype = 'text/html'; foreach(array_keys($combine) as $type) { if($combine[$type] > $bestq) { @@ -1399,6 +1399,9 @@ function common_negotiate_type($cprefs, $sprefs) } } + if ('text/html' === $besttype) { + return "text/html; charset=utf-8"; + } return $besttype; } diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php index 485b2a342d..141bcfe0ca 100755 --- a/scripts/update_facebook.php +++ b/scripts/update_facebook.php @@ -86,9 +86,13 @@ if ($cnt > 0) { ": Found $cnt new notices to send to Facebook since last run at " . date('Y-m-d H:i:s', $since) . "\n"; - updateLastUpdated($current_time); } +#Save the last updated time. It needs to do this even if there were no +#changes made, otherwise it will never create it and thus never send +#any updates at all. +updateLastUpdated($current_time); + exit(0);