Merge branch '2.6RC'2.6

1 files changed, 39 insertions, 0 deletions

diff --git a/include/taxonomy.php b/include/taxonomy.php
index 0b4b2aa9a..46d661581 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -44,6 +44,45 @@ function term_query($table,$s,$type = TERM_UNKNOWN, $type2 = '') {
 }
 
 
+function term_item_parent_query($uid,$table,$s,$type = TERM_UNKNOWN, $type2 = '') {
+
+	// Allow asterisks for wildcard search
+	// In theory this means '%' will also do a wildcard search, but there appear to be multiple escape 
+	// issues with '%' in term names and trying to fix this with '\\%' here did not help.
+	// Ideally I think we want '*' to indicate wildcards and allow '%' literally in names, but that is being
+	// left for another developer on another day.  
+
+	$s = str_replace('*','%',$s);
+
+	if($type2) {
+		$r = q("select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term like '%s' and term.uid = %d and term.otype = 1",
+			intval($type),
+			intval($type2),
+			dbesc($s),
+			intval($uid)
+		);
+	}
+	else {
+		$r = q("select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term like '%s' and term.uid = %d and term.otype = 1",
+			intval($type),
+			dbesc($s),
+			intval($uid)
+		);
+	}
+
+	if($r) {
+		$str = '';
+		foreach($r as $rv) {
+			if($str)
+				$str .= ',';
+			$str .= intval($rv['parent']);
+		}
+		return " AND " . (($table) ? dbesc($table) . '.' : '') . "id in ( $str ) ";
+	}
+	return " AND false ";
+}
+
+
 function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') {
 	if(! $term) 
 		return false;