merge 3516 Br2.0 -> trunk

git-svn-id: http://piwigo.org/svn/trunk@3517 68402e56-0260-453c-a942-63ccdbb3a9ee

9 files changed, 17 insertions, 2 deletions

diff --git a/admin/maintenance.php b/admin/maintenance.php
index ba6b718bb..9d991d924 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -100,6 +100,15 @@ DELETE
     $c13y->maintenance();
     break;
   }
+  case 'search' :
+  {
+    $query = '
+DELETE
+  FROM '.SEARCH_TABLE.'
+;';
+    pwg_query($query);
+    break;
+  }
   case 'compiled-templates' :
   {
     $template->delete_compiled_templates();
diff --git a/admin/template/goto/maintenance.tpl b/admin/template/goto/maintenance.tpl
index 2e10a5828..d43571e00 100644
--- a/admin/template/goto/maintenance.tpl
+++ b/admin/template/goto/maintenance.tpl
@@ -13,6 +13,7 @@
   <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history summary'|@translate}</a></li>
   <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'purge sessions'|@translate}</a></li>
   <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'purge never used notification feeds'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
   <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li>
 </ul>
 
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 1bc52425c..13cd9f836 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -647,4 +647,5 @@ $lang['%d photos were deleted'] = '%d Fotos wurden gel&ouml;scht';
 /* TODO */ $lang['Released on'] = 'Released on';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
 ?>
\ No newline at end of file
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 374d3606b..b4e810f47 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -652,4 +652,5 @@ $lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
 $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
 $lang['Subscribe %s'] = 'Subscribe %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
+$lang['Purge search history'] = 'Purge search history';
 ?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 2f32cf027..29cc787e1 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -645,4 +645,5 @@ $lang['Downloads'] = 'Descargar';
 $lang['Released on'] = 'Añadido';
 $lang['Number of downloads'] = 'Número de descargar';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 62946d784..d0674f46e 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -655,5 +655,5 @@ $lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
 $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Restez en contact avec le projet Piwigo, abonnez-vous à la newsletter. Vous recevrez un email lorsqu\'une nouvelle version sera disponible (parfois un bug de sécurité est corrigé, il est important d\'être au courant et de mettre à jour) ou qu\'un événement majeur surviendra sur le projet. Seulement quelques messages par an.';
 $lang['Subscribe %s'] = 'Abonner %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
-
+$lang['Purge search history'] = 'Purger l\'historique des recherches';
 ?>
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 0215cb822..d57836619 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -651,5 +651,5 @@ $lang['Piwigo Announcements Newsletter'] = 'Newsletter Piwigo';
 $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Rimanete in contatto con il progetto con il progetto Piwigo, abbonatevi alla newsletter. Riceverete un mail ad ogni volta che una nuova versione sarà disponibile (avvolte un bug di sicurezza è corretto, è importante esserne al corrente e d\'aggiornare il prodotto) o che un evento importante sorga sul progetto. Solo qualche mail all\'anno';
 $lang['Subscribe %s'] = 'Abbonare %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abbonare %s alla newsletter Piwigo';
-
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
 ?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 1ba990df0..a4c73397e 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -643,4 +643,5 @@ $lang['edit category informations'] = 'bewerk categorie informatie';
 /* TODO */ $lang['Released on'] = 'Released on';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
 ?>
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 858249442..d9801ca5a 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -648,4 +648,5 @@ $lang['Bound template'] = 'Przypisz Szablon';
 /* TODO */ $lang['Released on'] = 'Released on';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
+/*TODO*/$lang['Purge search history'] = 'Purge search history';
 ?>