diff options
| author | Mario <mario@mariovavti.com> | 2021-03-22 13:37:31 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-22 13:37:31 +0100 |
| commit | f6d88f20f3139c75e13798e81427b58aafce7738 (patch) | |
| tree | b4f11209f754c00bf3755b48592464e8e971fb42 | |
| parent | 598c3aa336ac12a867be2f1ec38a3ce00f937a94 (diff) | |
| parent | ccefb99cbee3c8585ede2c6e67289c5d54b38dca (diff) | |
| download | volse-hubzilla-f6d88f20f3139c75e13798e81427b58aafce7738.tar.gz volse-hubzilla-f6d88f20f3139c75e13798e81427b58aafce7738.tar.bz2 volse-hubzilla-f6d88f20f3139c75e13798e81427b58aafce7738.zip | |
Merge branch 'air' of https://framagit.org/hubzilla/core into air
| -rw-r--r-- | Zotlabs/Lib/Libsync.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index e16b68cf8..7e97e4c70 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -781,7 +781,7 @@ class Libsync { $t = datetime_convert('UTC', 'UTC', 'now - 15 minutes'); if (array_key_exists('site', $arr) && $location['url'] == $arr['site']['url']) { - q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_connected < '%s'", + q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_updated < '%s'", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($r[0]['hubloc_id']), diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 8a87d98f7..73dfa0816 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -101,7 +101,7 @@ class Search extends Controller { } // look for a naked webbie - if (strpos($search, '@') !== false) { + if (strpos($search,'@') !== false && strpos($search,'http') !== 0) { goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search); } |