Merge pull request #20 from tbrisker/master

prevent collision if i18n function already exists
This commit is contained in:
Martin Monperrus
2014-06-23 19:35:29 +02:00
+2
View File
@@ -353,6 +353,7 @@ function _zetDB($bibtex_filenames) {
} // end function setDB } // end function setDB
// internationalization // internationalization
if (!function_exists('__')){
function __($msg) { function __($msg) {
global $BIBTEXBROWSER_LANG; global $BIBTEXBROWSER_LANG;
if (isset($BIBTEXBROWSER_LANG[$msg])) { if (isset($BIBTEXBROWSER_LANG[$msg])) {
@@ -360,6 +361,7 @@ function __($msg) {
} }
return $msg; return $msg;
} }
}
// factories // factories
// may be overridden in bibtexbrowser.local.php // may be overridden in bibtexbrowser.local.php