and merge that into stable...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@590 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
		
							parent
							
								
									16f83a8f2b
								
							
						
					
					
						commit
						de6547cd4b
					
				| @ -153,12 +153,14 @@ class Database { | |||||||
| 			else { | 			else { | ||||||
| 				$term = str_replace("*", "%", $term); | 				$term = str_replace("*", "%", $term); | ||||||
| 				$term = str_replace("?", "_", $term); | 				$term = str_replace("?", "_", $term); | ||||||
|  | 				if(!preg_match("/^[%_]+$/", $term)) { | ||||||
| 					$sign = $negative ? "-" : "+"; | 					$sign = $negative ? "-" : "+"; | ||||||
| 					if($sign == "+") $positive_tag_count++; | 					if($sign == "+") $positive_tag_count++; | ||||||
| 					else $negative_tag_count++; | 					else $negative_tag_count++; | ||||||
| 					$tag_search->append(new Querylet(" $sign (tag LIKE ?)", array($term))); | 					$tag_search->append(new Querylet(" $sign (tag LIKE ?)", array($term))); | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  | 		} | ||||||
| 
 | 
 | ||||||
| 		if($positive_tag_count + $negative_tag_count == 0) { | 		if($positive_tag_count + $negative_tag_count == 0) { | ||||||
| 			$query = new Querylet($this->get_images); | 			$query = new Querylet($this->get_images); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user