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

Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x

This commit is contained in:
Evan Prodromou 2009-02-02 16:46:51 -05:00
parent daa5797809 b6f0f72a09
commit ab16bb876b
14 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -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.

2
actions/disfavor.php
View File

@ -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');

2
actions/favor.php
View File

@ -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');

2
actions/newnotice.php
View File

@ -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');

2
actions/nudge.php
View File

@ -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');

2
actions/subscribe.php
View File

@ -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');

2
actions/tagother.php
View File

@ -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');

2
actions/unsubscribe.php
View File

@ -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');

8
lib/action.php
View File

@ -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 {

2
lib/clienterroraction.php
View File

@ -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)

1
lib/error.php
View File

@ -130,6 +130,7 @@ class ErrorAction extends Action
{
$this->elementStart('div', array('id' => 'header'));
$this->showLogo();
$this->showPrimaryNav();
$this->elementEnd('div');
}

2
lib/servererroraction.php
View File

@ -67,7 +67,7 @@ class ServerErrorAction extends ErrorAction
$this->default = 500;
}
// XXX: Should these error actions even be invokable via URI?
function handle($args)

5
lib/util.php
View File

@ -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;
}

6
scripts/update_facebook.php
View File

@ -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);