aboutsummaryrefslogtreecommitdiffstats
path: root/mod/directory.php
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-01-28 23:19:13 +0100
committermrjive <mrjive@mrjive.it>2016-01-28 23:19:13 +0100
commit28943af494eae225b256b9771a5699a1b05d7a2f (patch)
tree1f135da64c0935053f468281f8353e8279a18448 /mod/directory.php
parentc49e4f52ae83441c4a1dcf52e433dded8d767679 (diff)
parent5f1eb18da4d6380b64e83e0eeda6f1037de2fec9 (diff)
downloadvolse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.tar.gz
volse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.tar.bz2
volse-hubzilla-28943af494eae225b256b9771a5699a1b05d7a2f.zip
Merge pull request #19 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/directory.php')
-rw-r--r--mod/directory.php7
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)