Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
49e383e78a
|
@ -500,7 +500,7 @@ function jappixmini_script(&$a,&$s) {
|
||||||
$nickname = json_encode($r[0]["username"]);
|
$nickname = json_encode($r[0]["username"]);
|
||||||
$groupchats = get_config('jappixmini','groupchats');
|
$groupchats = get_config('jappixmini','groupchats');
|
||||||
//if $groupchats has no value jappix_addon_start will produce a syntax error
|
//if $groupchats has no value jappix_addon_start will produce a syntax error
|
||||||
if(!isset($groupchats)){
|
if(empty($groupchats)){
|
||||||
$groupchats = "{}";
|
$groupchats = "{}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
BIN
statusnet.tgz
BIN
statusnet.tgz
Binary file not shown.
|
@ -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 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>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue