From b654fdac5699b0ad3722444a69c027f5c9f01a1b Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 14 Mar 2007 23:50:21 +0000
Subject: minimal changes (lang, small tpl change and quick search on tag url
 names in addition to name - handy with accentuated letters)

git-svn-id: http://piwigo.org/svn/trunk@1906 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_search.inc.php         |  5 ++++-
 language/en_UK.iso-8859-1/admin.lang.php |  2 +-
 template/yoga/admin/configuration.tpl    | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php
index 1f7469021..e2d518e0d 100644
--- a/include/functions_search.inc.php
+++ b/include/functions_search.inc.php
@@ -385,10 +385,13 @@ SELECT id
   $q_like_clause = get_qsearch_like_clause($q, 'CONVERT(name, CHAR)' );
   if (!empty($q_like_clause))
   {
+    // search also by url name (without accents)
+    $q_like_clause_url = get_qsearch_like_clause($q, 'url_name' );
     $query = '
 SELECT id
   FROM '.TAGS_TABLE.'
-  WHERE '.$q_like_clause;
+  WHERE '.$q_like_clause.'
+  OR '.$q_like_clause_url;
     $tag_ids = array_from_query( $query, 'id');
     if (!empty($tag_ids))
     { // we got some tags
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 5004c5b98..3c5dbffff 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -85,7 +85,7 @@ $lang['Elements'] = 'Elements';
 $lang['Email administrators when a new user registers'] = 'Email admins when a new user registers';
 $lang['Email administrators when a valid comment is entered'] = 'Email admins when a valid comment is entered';
 $lang['Email administrators when a comment requires validation'] = 'Email admins when a comment requires validation';
-$lang['Email administrators when a picture is uploaded'] = 'Email adminis when a picture is uploaded';
+$lang['Email administrators when a picture is uploaded'] = 'Email admins when a picture is uploaded';
 $lang['Empty caddie'] = 'Empty caddie';
 $lang['Environment'] = 'Environment';
 $lang['Expand all categories'] = 'Expand all categories';
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index 33da00a98..bf82c5d22 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -52,16 +52,16 @@
     </li>
 
     <li>
-      <label>
-        <span class="property">{lang:Email administrators when a new user registers}</span>
-        <input type="checkbox" name="email_admin_on_new_user" {main.EMAIL_ADMIN_ON_NEW_USER} />
+      <label for="allow_user_registration">
+        <span class="property">{lang:Allow user registration}</span>
+        <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
       </label>
     </li>
 
     <li>
-      <label for="allow_user_registration">
-        <span class="property">{lang:Allow user registration}</span>
-        <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
+      <label>
+        <span class="property">{lang:Email administrators when a new user registers}</span>
+        <input type="checkbox" name="email_admin_on_new_user" {main.EMAIL_ADMIN_ON_NEW_USER} />
       </label>
     </li>
 
-- 
cgit v1.2.3