Merge branch 'master' of github.com:movim/movim

9 years ago · 93694e0d48
2 changed files with 0 additions and 4 deletions
--- a/app/widgets/Presence/Presence.php
+++ b/app/widgets/Presence/Presence.php
@ -58,9 +58,6 @@ class Presence extends \Movim\Widget\Base

            if($presence == null || !isset($presence['show']) || $presence['show'] == '')
                $value = 'chat';
-
-            if($presence == null|| !isset($presence['status']) || $presence['status'] == '')
-                $status = $this->__('status.online');
        } else {
            $status = $form['status'];
            $value = $form['value'];
--- a/app/widgets/Presence/locales.ini
+++ b/app/widgets/Presence/locales.ini
@ -4,4 +4,3 @@ here         = Your status here !
 updated      = Status updated
 status       = Status
 presence     = Presence
-online       = Online with Movim