wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-10-15 04:49:59 -04:00
commit c1c8daa021
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apidirectmessagenew.php
View File

@ -157,7 +157,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
// Note: sending msgs to yourself is allowed by Twitter // Note: sending msgs to yourself is allowed by Twitter
$errmsg = 'Don\'t send a message to yourself; ' . $errmsg = 'Don\'t send a message to yourself; ' .
'just say it to yourself quietly instead.' 'just say it to yourself quietly instead.';
$this->clientError(_($errmsg), 403, $this->format); $this->clientError(_($errmsg), 403, $this->format);
return; return;

2
actions/apifavoritecreate.php
View File

@ -127,7 +127,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
if (empty($fave)) { if (empty($fave)) {
$this->clientError( $this->clientError(
_('Could not create favorite.') _('Could not create favorite.'),
403, 403,
$this->format $this->format
); );

16
extlib/php-gettext/ChangeLog
View File

@ -1,3 +1,19 @@
2006-02-28 Danilo Šegan <danilo@gnome.org>
* gettext.php: Added some comments about these workarounds for
different PHP versions and architectures.
2006-02-28 Danilo Šegan <danilo@gnome.org>
Fixes bug #15923.
* gettext.php (gettext_reader): make magic check work on 64-bit
platforms as well (by Steffen Pingel).
2006-02-20 Danilo Šegan <danilo@gnome.org>
* gettext.inc (_bindtextdomain): Use php_uname to detect Windows.
2006-02-07 Danilo Šegan <danilo@gnome.org> 2006-02-07 Danilo Šegan <danilo@gnome.org>
* examples/pigs_dropin.php: comment-out bind_textdomain_codeset * examples/pigs_dropin.php: comment-out bind_textdomain_codeset

6
extlib/php-gettext/gettext.php
View File

@ -102,16 +102,16 @@ class gettext_reader {
// Caching can be turned off // Caching can be turned off
$this->enable_cache = $enable_cache; $this->enable_cache = $enable_cache;
// $MAGIC1 = (int)0x950412de; //bug in PHP 5 // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
$MAGIC1 = (int) - 1794895138; $MAGIC1 = (int) - 1794895138;
// $MAGIC2 = (int)0xde120495; //bug // $MAGIC2 = (int)0xde120495; //bug
$MAGIC2 = (int) - 569244523; $MAGIC2 = (int) - 569244523;
$this->STREAM = $Reader; $this->STREAM = $Reader;
$magic = $this->readint(); $magic = $this->readint();
if ($magic == $MAGIC1) { if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
$this->BYTEORDER = 0; $this->BYTEORDER = 0;
} elseif ($magic == $MAGIC2) { } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
$this->BYTEORDER = 1; $this->BYTEORDER = 1;
} else { } else {
$this->error = 1; // not MO file $this->error = 1; // not MO file

2
plugins/FBConnect/FBConnectPlugin.php
View File

@ -102,7 +102,7 @@ class FBConnectPlugin extends Plugin
// Note: this script needs to appear in the <body> // Note: this script needs to appear in the <body>
function onStartShowHeader($action) function onEndShowScripts($action)
{ {
if ($this->reqFbScripts($action)) { if ($this->reqFbScripts($action)) {