diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
| commit | c766cf9565129b762998e709f5ee7c3eb14cffca (patch) | |
| tree | c462e39540d6f63e30d10aca1c64ffefcfa4d4ef /mod/directory.php | |
| parent | e4674142c6a205651d4bb207aa038e6d089da73f (diff) | |
| parent | 722d7ff38d5bbf49a7c990d9219998c2c8a5b58f (diff) | |
| download | volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.gz volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.bz2 volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php index 4ab118b17..dca96694e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -144,11 +144,14 @@ function directory_content(&$a) { } if($url) { - // We might want to make the tagadelic count (&kw=) configurable or turn it off completely. $numtags = get_config('system','directorytags'); - $kw = ((intval($numtags)) ? $numtags : 50); + $kw = ((intval($numtags) > 0) ? intval($numtags) : 50); + + if(get_config('system','disable_directory_keywords')) + $kw = 0; + $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); if($token) |