Merge pull request #20 from tbrisker/master

prevent collision if i18n function already exists
2014-06-23 19:35:29 +02:00
parent 25212dd687 7ad2d10102
commit 8c5868be17
1 changed files with 7 additions and 5 deletions
@@ -353,12 +353,14 @@ function _zetDB($bibtex_filenames) {
 } // end function setDB

 // internationalization
-function __($msg) {
+if (!function_exists('__')){
+  function __($msg) {
    global $BIBTEXBROWSER_LANG;
    if (isset($BIBTEXBROWSER_LANG[$msg])) {
      return $BIBTEXBROWSER_LANG[$msg];
    }
    return $msg;
+  }
 }

 // factories