projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed minor vulnerability in Mail Fetch plugin [CVE-2010-1637/TEHTRI-SA-2010-009]
[squirrelmail.git]
/
functions
/
gettext.php
diff --git
a/functions/gettext.php
b/functions/gettext.php
index 5a8f180a4285065c9c32a9be5e764ab50cec7bcb..0b84bba58b4c98074f7e967ee506c49610da4aaa 100644
(file)
--- a/
functions/gettext.php
+++ b/
functions/gettext.php
@@
-8,7
+8,7
@@
*
* @link http://www.php.net/gettext Original php gettext manual
* @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes
*
* @link http://www.php.net/gettext Original php gettext manual
* @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes
- * @copyright
© 1999-2006
The SquirrelMail Project Team
+ * @copyright
1999-2010
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @since 1.1.2
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @since 1.1.2
@@
-16,8
+16,6
@@
* @subpackage i18n
*/
* @subpackage i18n
*/
-/** Almost everything requires global.php... */
-require_once(SM_PATH . 'functions/global.php');
/** Load classes and other functions */
include_once(SM_PATH . 'class/l10n.class.php');
/** Load classes and other functions */
include_once(SM_PATH . 'class/l10n.class.php');
@@
-36,7
+34,7
@@
function _($str) {
global $l10n, $gettext_domain;
if (! isset($l10n[$gettext_domain]) ||
! is_object($l10n[$gettext_domain]) ||
global $l10n, $gettext_domain;
if (! isset($l10n[$gettext_domain]) ||
! is_object($l10n[$gettext_domain]) ||
- $l10n[$gettext_domain]->error==1)
+ $l10n[$gettext_domain]->error==1)
return $str;
return $l10n[$gettext_domain]->translate($str);
}
return $str;
return $l10n[$gettext_domain]->translate($str);
}
@@
-98,9
+96,8
@@
if (! function_exists('dgettext')) {
global $l10n;
if (! isset($l10n[$domain]) ||
! is_object($l10n[$domain]) ||
global $l10n;
if (! isset($l10n[$domain]) ||
! is_object($l10n[$domain]) ||
- $l10n[$domain]->error==1)
+ $l10n[$domain]->error==1)
return $str;
return $l10n[$domain]->translate($str);
}
}
return $str;
return $l10n[$domain]->translate($str);
}
}
-?>
\ No newline at end of file