Move deadlock info logging to Db.php, fix core updater translation regression, fix core updater css regression, change logger_message level column to string, and delete unneeded logger tables if not empty. Also includes some changes to travis build.

1 files changed, 10 insertions, 0 deletions

diff --git a/core/Twig.php b/core/Twig.php
index 0520d242d7..3155f5b0d8 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -71,6 +71,16 @@ class Twig
         $this->addFunction_sparkline();
         $this->addFunction_postEvent();
         $this->addFunction_isPluginLoaded();
+        $this->addFunction_getJavascriptTranslations();
+    }
+
+    protected function addFunction_getJavascriptTranslations()
+    {
+        $getJavascriptTranslations = new Twig_SimpleFunction(
+            'getJavascriptTranslations',
+            array(Translate::getInstance(), 'getJavascriptTranslations')
+        );
+        $this->twig->addFunction($getJavascriptTranslations);
     }
 
     protected function addFunction_isPluginLoaded()