diff options
| author | Mario <mario@mariovavti.com> | 2020-12-29 20:16:35 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-29 20:16:35 +0000 |
| commit | dff42ffb41d1c42b0255f2ee9d2271598ee3139a (patch) | |
| tree | 4854d808ab4099c60a84b68caf8dfcf3e92b83b9 | |
| parent | 11d61a744dcdbc47cdbad2122ca1e5417b8d6235 (diff) | |
| parent | 5cefdbf98519ef6cb5dbd397e19ff9d0d79258d3 (diff) | |
| download | volse-hubzilla-dff42ffb41d1c42b0255f2ee9d2271598ee3139a.tar.gz volse-hubzilla-dff42ffb41d1c42b0255f2ee9d2271598ee3139a.tar.bz2 volse-hubzilla-dff42ffb41d1c42b0255f2ee9d2271598ee3139a.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Dirsearch.php | 4 | ||||
| -rw-r--r-- | include/connections.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index c15b13a90..804d7af5c 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -192,7 +192,7 @@ class Dirsearch extends Controller { else { $qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec); if($return_total) { - $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql "); + $r = q("SELECT COUNT(xchan_hash) AS total FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot6' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql "); if($r) { $ret['total_items'] = $r[0]['total']; } @@ -261,7 +261,7 @@ class Dirsearch extends Controller { else { $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash - where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 + where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot6' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $order $qlimit " ); diff --git a/include/connections.php b/include/connections.php index 100e595d0..bd41e112e 100644 --- a/include/connections.php +++ b/include/connections.php @@ -472,7 +472,7 @@ function random_profile() { $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 - xchan_network = 'zot' and xchan_deleted = 0 and + xchan_network = 'zot6' and xchan_deleted = 0 and hubloc_connected > %s - interval %s order by $randfunc limit 1", db_utcnow(), db_quoteinterval('30 day') |