aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/connections.php12
-rw-r--r--include/markdown.php1
-rw-r--r--include/nav.php12
3 files changed, 6 insertions, 19 deletions
diff --git a/include/connections.php b/include/connections.php
index c4c719ab8..8df795190 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -420,9 +420,9 @@ function random_profile() {
for($i = 0; $i < $retryrandom; $i++) {
- $r = q("select xchan_url from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_addr not like '%s' and xchan_hidden = 0 and hubloc_connected > %s - interval %s order by $randfunc limit 1",
- dbesc('sys@%'),
- db_utcnow(), db_quoteinterval('30 day')
+ $r = q("select xchan_url, xchan_hash from xchan left join hubloc on hubloc_hash = xchan_hash where xchan_hidden = 0 and xchan_system = 0 and hubloc_connected > %s - interval %s order by $randfunc limit 1",
+ db_utcnow(),
+ db_quoteinterval('30 day')
);
if(!$r) return ''; // Couldn't get a random channel
@@ -430,12 +430,12 @@ function random_profile() {
if($checkrandom) {
$x = z_fetch_url($r[0]['xchan_url']);
if($x['success'])
- return $r[0]['xchan_url'];
+ return $r[0]['xchan_hash'];
else
logger('Random channel turned out to be bad.');
}
else {
- return $r[0]['xchan_url'];
+ return $r[0]['xchan_hash'];
}
}
@@ -717,4 +717,4 @@ function vcard_query(&$r) {
}
}
}
-} \ No newline at end of file
+}
diff --git a/include/markdown.php b/include/markdown.php
index 9201993df..5d3c4c7df 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -13,7 +13,6 @@ require_once("include/html2bbcode.php");
require_once("include/bbcode.php");
-
/**
* @brief
*
diff --git a/include/nav.php b/include/nav.php
index 4d6c479da..b0533e4c7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -212,18 +212,6 @@ EOT;
$nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'),'admin_nav_btn');
}
-
- /**
- *
- * Provide a banner/logo/whatever
- *
- */
-
- $banner = get_config('system','banner');
-
- if($banner === false)
- $banner = get_config('system','sitename');
-
$x = array('nav' => $nav, 'usermenu' => $userinfo );
call_hooks('nav', $x);