diff options
| author | friendica <info@friendica.com> | 2014-08-28 19:05:13 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-28 19:05:13 -0700 |
| commit | 95def2a247eca54a52744e405e837d5810cca83d (patch) | |
| tree | a8bbd8613b9bc43ae60b03744afd14a81791c584 | |
| parent | e20fe41f2310e77f57bece8e593a856b34bedc34 (diff) | |
| download | volse-hubzilla-95def2a247eca54a52744e405e837d5810cca83d.tar.gz volse-hubzilla-95def2a247eca54a52744e405e837d5810cca83d.tar.bz2 volse-hubzilla-95def2a247eca54a52744e405e837d5810cca83d.zip | |
retro-actively set standalone directory fix, also a fix for directory endless scroll when you hit the end.
| -rw-r--r-- | mod/directory.php | 5 | ||||
| -rw-r--r-- | mod/dirsearch.php | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mod/directory.php b/mod/directory.php index 8dbed4115..39eeb36ce 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -233,6 +233,11 @@ function directory_content(&$a) { } else { + if($_REQUEST['aj']) { + $o = '<div id="content-complete"></div>'; + echo $o; + killme(); + } if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) { goaway(z_root() . '/chanview/?f=&address=' . $search); } diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 96e576a19..e292553ad 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -29,6 +29,7 @@ function dirsearch_content(&$a) { $sql_extra = ''; + $tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords'); if($_REQUEST['query']) { @@ -145,6 +146,11 @@ function dirsearch_content(&$a) { if($hash) $logic = 1; + if($dirmode == DIRECTORY_MODE_STANDALONE) { + $sql_extra .= " and xchan_addr like '%%" . get_app()->get_hostname() . "' "; + } + + $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) " : ''); if($safe < 0) $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) "; @@ -254,8 +260,8 @@ function dirsearch_content(&$a) { } } } - json_return_and_die($ret); + json_return_and_die($ret); } function dir_query_build($joiner,$field,$s) { |