Merged in paulis/processmaker/PM-4243 (pull request #3272)

PM-4243
2015-11-30 14:57:24 -04:00
parent 242ab93c98 57fd7c8420
commit 0320db6c27
1 changed files with 1 additions and 1 deletions
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -717,7 +717,7 @@ class Bootstrap
     * @param  string lang
     * @return void
     */
-    public function LoadTranslationObject($lang = SYS_LANG)
+    public static function LoadTranslationObject($lang = SYS_LANG)
    {
        $defaultTranslations = Array();
        $foreignTranslations = Array();