From 2ebb305786902d771873aff5921d6559b906253e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 20 May 2017 22:43:45 +0100
Subject: [PATCH] movim fixes

---
 src/freedombone-app-movim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim
index c6a75ec6..c2e99c1e 100755
--- a/src/freedombone-app-movim
+++ b/src/freedombone-app-movim
@@ -37,7 +37,7 @@ MOVIM_DOMAIN_NAME=
 MOVIM_CODE=
 MOVIM_ONION_PORT=8117
 MOVIM_REPO="https://github.com/movim/movim"
-MOVIM_COMMIT='add1a247804eb0e34fc28a74c2eeea16792ffa8e'
+MOVIM_COMMIT='6142c2033b7695448516a67690324a3bde048260'
 MOVIM_ADMIN_PASSWORD=
 MOVIM_DAEMON_PORT=8880
 
@@ -162,6 +162,7 @@ function upgrade_movim {
 
     cd /var/www/${MOVIM_DOMAIN_NAME}/htdocs
     php composer.phar install
+    php mud.php db --set
     chown -R www-data:www-data /var/www/${MOVIM_DOMAIN_NAME}/htdocs
 }
 
@@ -345,6 +346,9 @@ function install_movim {
     sed -i "s|'admin'|'${MY_USERNAME}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
     sed -i "s|'password'|'${MOVIM_ADMIN_PASSWORD}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
 
+    # Fix typo
+    sed -i 's|weksocket|websocket|g' app/widgets/AdminTest/admintest.js
+
     # curl -sS https://getcomposer.org/installer | php
     if [ -f ~/freedombone/image_build/composer_install ]; then
         cat ~/freedombone/image_build/composer_install | php