summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
-rw-r--r--actions/disfavor.php2
-rw-r--r--actions/favor.php2
-rw-r--r--actions/newnotice.php2
-rw-r--r--actions/nudge.php2
-rw-r--r--actions/subscribe.php2
-rw-r--r--actions/tagother.php2
-rw-r--r--actions/unsubscribe.php2
-rw-r--r--lib/action.php8
-rw-r--r--lib/clienterroraction.php2
-rw-r--r--lib/error.php1
-rw-r--r--lib/servererroraction.php2
-rw-r--r--lib/util.php5
-rwxr-xr-xscripts/update_facebook.php6
14 files changed, 27 insertions, 13 deletions
diff --git a/README b/README
index ba0deb2c3..0c605151b 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 09b3bf18d..90bab3cca 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 8ecde4b11..3940df688 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 572adbb23..5142cb5ff 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 ca7947f5a..bc3d48478 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 171332734..f761992de 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 9b06cb43e..cbace5b6b 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 f9dd6f821..b1e2b6425 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 4d4c3d4c9..587d2ab13 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 ef6fd51df..5019dc06d 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 9842053d8..03065bc70 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 a39886591..80a3fdd7b 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 d7af3f204..07e124811 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 485b2a342..141bcfe0c 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);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-02 07:59:34 +0000