aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-10 15:59:49 -0800
committerzotlabs <mike@macgirvin.com>2016-11-10 15:59:49 -0800
commit20497f1be30348cddc4c16f7ffa5615cc17a4225 (patch)
tree150b3000813fc5d475c1e6c39a5c3ee0999a5c4d /include
parent74947d1c1cb7c669ef2a167990066b34d89b5b07 (diff)
downloadvolse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.tar.gz
volse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.tar.bz2
volse-hubzilla-20497f1be30348cddc4c16f7ffa5615cc17a4225.zip
Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin on the first hop since we no longer provide the twitter api by default
Diffstat (limited to 'include')
-rw-r--r--include/channel.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php
index c02d5266e..e35f453de 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1539,11 +1539,11 @@ function remote_online_status($webbie) {
*/
function identity_selector() {
- if (local_channel()) {
+ if(local_channel()) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
intval(get_account_id())
);
- if (count($r) > 1) {
+ if($r && count($r) > 1) {
//$account = App::get_account();
$o = replace_macros(get_markup_template('channel_id_select.tpl'), array(
'$channels' => $r,