james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.2 merge

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@871 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-05-20 03:07:26 +00:00
parent 642a3d02e1
commit 96509995a8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/database.class.php
View File

@ -338,7 +338,7 @@ class Database {
$tags = array_map(array($this, 'resolve_alias'), $tags); $tags = array_map(array($this, 'resolve_alias'), $tags);
$tags = array_map(array($this, 'sanitise'), $tags); $tags = array_map(array($this, 'sanitise'), $tags);
$tags = array_unique($tags); // remove any duplicate tags $tags = array_iunique($tags); // remove any duplicate tags
// delete old // delete old
$this->delete_tags_from_image($image_id); $this->delete_tags_from_image($image_id);

17
core/util.inc.php
View File

@ -343,6 +343,23 @@ function array_contains($array, $target) {
return false; return false;
} }
// case insensetive uniqueness
function array_iunique($array) {
$ok = array();
foreach($array as $element) {
$found = false;
foreach($ok as $existing) {
if(strtolower($element) == strtolower($existing)) {
$found = true; break;
}
}
if(!$found) {
$ok[] = $element;
}
}
return $ok;
}
// from http://uk.php.net/network // from http://uk.php.net/network
function ip_in_range($IP, $CIDR) { function ip_in_range($IP, $CIDR) {
list ($net, $mask) = split ("/", $CIDR); list ($net, $mask) = split ("/", $CIDR);