diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-07 17:11:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-07 17:11:35 -0700 |
| commit | 9dbd99714186ac5ea008e8e17e12be5076e8553f (patch) | |
| tree | 3898c5422c9fb854d7ebe21084ec409ed45f2140 /include | |
| parent | 2e35dc648fd61ae2d39e8c46c14dbf19d31942fb (diff) | |
| parent | 55836e8ca65ca9a2ae25591de3232470d7a50049 (diff) | |
| download | volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.gz volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.tar.bz2 volse-hubzilla-9dbd99714186ac5ea008e8e17e12be5076e8553f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/connections.php | 12 | ||||
| -rw-r--r-- | include/markdown.php | 1 | ||||
| -rw-r--r-- | include/nav.php | 12 |
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); |