summaryrefslogtreecommitdiff
path: root/extlib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-19 15:36:26 -0400
committerEvan Prodromou <evan@status.net>2009-10-19 15:36:26 -0400
commit035d4cf86e8cd2bec46a9b24e098c798f3ec3cb3 (patch)
treede92e5245dffd047460b60425a3d4035d84d0435 /extlib
parent90de6eae5a6195e4455a726d7183dbefc8eeb617 (diff)
parentce4ed6cca54134152c11baf8e0d0ff5b587b4998 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib')
-rw-r--r--extlib/php-gettext/gettext.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extlib/php-gettext/gettext.inc b/extlib/php-gettext/gettext.inc
index fcaafe7c9..7c95e40ec 100644
--- a/extlib/php-gettext/gettext.inc
+++ b/extlib/php-gettext/gettext.inc
@@ -129,7 +129,7 @@ function _setlocale($category, $locale) {
$ret = 0;
if (function_exists('setlocale')) // I don't know if this ever happens ;)
$ret = setlocale($category, $locale);
- if (($ret and $locale == '') or ($ret == $locale)) {
+ if ($ret and ($locale == '' or $ret == $locale)) {
$EMULATEGETTEXT = 0;
$CURRENTLOCALE = $ret;
} else {