aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-05 03:31:50 -0700
committerzotlabs <mike@macgirvin.com>2016-11-05 03:31:50 -0700
commit8811ca9e9efc8e177a49702066402fae819bdf5b (patch)
tree815d3b4c21c430b89a6ef6249a8339663b991360 /include
parentb541351a0a52d156085b0f1e06079c1c2e409eb8 (diff)
downloadvolse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.gz
volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.bz2
volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.zip
provide /locs link on settings page if there is more than one hubloc for this channnel *that isn't deleted*.
Diffstat (limited to 'include')
-rw-r--r--include/channel.php2
-rw-r--r--include/widgets.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php
index 6d180da01..1f12e9927 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -162,7 +162,7 @@ function channel_total() {
* Also creates the related xchan, hubloc, profile, and "self" abook records,
* and an empty "Friends" group/collection for the new channel.
*
- * @param array $arr assoziative array with:
+ * @param array $arr associative array with:
* * \e string \b name full name of channel
* * \e string \b nickname "email/url-compliant" nickname
* * \e int \b account_id to attach with this channel
diff --git a/include/widgets.php b/include/widgets.php
index cc0b20a72..6cff4e4b7 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -581,11 +581,11 @@ function widget_settings_menu($arr) {
if($abk)
$abook_self_id = $abk[0]['abook_id'];
- $hublocs = q("select count(*) as total from hubloc where hubloc_hash = '%s'",
+ $x = q("select count(*) as total from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 ",
dbesc($channel['channel_hash'])
);
- $hublocs = (($hublocs[0]['total'] > 1) ? true : false);
+ $hublocs = (($x && $x[0]['total'] > 1) ? true : false);
$tabs = array(
array(