Merge remote-tracking branch 'upstream/master'

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index aedbffd..5f5c53e 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -500,7 +500,7 @@ function jappixmini_script(&$a,&$s) {
     $nickname = json_encode($r[0]["username"]);
     $groupchats = get_config('jappixmini','groupchats');
     //if $groupchats has no value jappix_addon_start will produce a syntax error
-    if(!isset($groupchats)){
+    if(empty($groupchats)){
        $groupchats = "{}";
     }
 

diff --git a/statusnet.tgz b/statusnet.tgz
index 57ce110..664bb88 100755 (executable)
Binary files a/statusnet.tgz and b/statusnet.tgz differ

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 66aa3bd..b16dedf 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -391,7 +391,7 @@ function statusnet_settings(&$a,&$s) {
                        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
                }
        }
-        $s .= '</div><div class="clear"></div></div>';
+        $s .= '</div><div class="clear"></div>';
 }