fixes
This commit is contained in:
		
							parent
							
								
									cfd1b72b86
								
							
						
					
					
						commit
						199a0d709c
					
				@ -489,7 +489,7 @@ class Tag {
 | 
				
			|||||||
			// do nothing
 | 
								// do nothing
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		else {
 | 
							else {
 | 
				
			||||||
			die("tag_explode only takes strings or arrays");
 | 
								die("Tag::explode() only takes strings or arrays");
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$tags = array_map("trim", $tags);
 | 
							$tags = array_map("trim", $tags);
 | 
				
			||||||
 | 
				
			|||||||
@ -242,11 +242,11 @@ class TagList implements Extension {
 | 
				
			|||||||
		global $config;
 | 
							global $config;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$query = "
 | 
							$query = "
 | 
				
			||||||
			SELECT tags.tag, tags.count
 | 
								SELECT tags.tag, tags.count as calc_count
 | 
				
			||||||
			FROM tags, image_tags
 | 
								FROM tags, image_tags
 | 
				
			||||||
			WHERE tags.id = image_tags.tag_id
 | 
								WHERE tags.id = image_tags.tag_id
 | 
				
			||||||
			AND image_tags.image_id = ?
 | 
								AND image_tags.image_id = ?
 | 
				
			||||||
			ORDER BY count DESC
 | 
								ORDER BY calc_count DESC
 | 
				
			||||||
			LIMIT ?
 | 
								LIMIT ?
 | 
				
			||||||
		";
 | 
							";
 | 
				
			||||||
		$args = array($image->id, $config->get_int('tag_list_length'));
 | 
							$args = array($image->id, $config->get_int('tag_list_length'));
 | 
				
			||||||
@ -280,7 +280,7 @@ class TagList implements Extension {
 | 
				
			|||||||
		global $database;
 | 
							global $database;
 | 
				
			||||||
		global $config;
 | 
							global $config;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$wild_tags = tag_explode($search);
 | 
							$wild_tags = Tag::explode($search);
 | 
				
			||||||
		// $search_tags = array();
 | 
							// $search_tags = array();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$tag_id_array = array();
 | 
							$tag_id_array = array();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user