Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-07-07 16:50:25 -07:00
parent 7db1bd23f0 f6cf992aee
commit 6b41074396
15 changed files with 80 additions and 87 deletions
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -278,7 +278,7 @@ function dir_tagblock($link,$r) {
 	$o = '';

 	$observer = get_observer_hash();
-	if(! get_globaldir_setting($observer))
+	if(! get_directory_setting($observer, 'globaldir'))
 		return $o;


@@ -409,4 +409,4 @@ function get_things($profile_hash,$uid) {
 //logger('things: ' . print_r($sorted_things,true));

 	return $sorted_things;
-}
+}