From 139a057c3e61734fa480f1720d38bc1a2231ba94 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Mon, 3 Mar 2014 20:42:53 +0100
Subject: [PATCH] Rename 'Search bookmark' as 'Bookmarked search'. Add new
 error when bookmarked search name is missing.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 db_qbe.php                        | 2 +-
 libraries/DBQbe.class.php         | 2 +-
 libraries/SavedSearches.class.php | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index d2cebe443bb1..701f709c28c0 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -124,7 +124,7 @@
     $response->addHTML(
         PMA_Message::notice(
             __(
-                'After saving or loading a search bookmark, you can rename it and '
+                'After saving or loading a bookmarked search, you can rename it and '
                 . 'save the new criteria.'
             )
         )
diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
index f3c3dcc7f48c..db65a02914df 100644
--- a/libraries/DBQbe.class.php
+++ b/libraries/DBQbe.class.php
@@ -1448,7 +1448,7 @@ public function getSelectionForm($cfgRelation)
      */
     private function _getSavedSearchesField()
     {
-        $html_output = __('Saved search bookmark:');
+        $html_output = __('Saved bookmarked search:');
         $html_output .= ' <select name="searchId" id="searchId">';
         $html_output .= '<option value="">New bookmark</option>';
 
diff --git a/libraries/SavedSearches.class.php b/libraries/SavedSearches.class.php
index 3a62833d2834..b6b01384dc3d 100644
--- a/libraries/SavedSearches.class.php
+++ b/libraries/SavedSearches.class.php
@@ -241,13 +241,19 @@ public function __construct($config)
      */
     public function save()
     {
+        if (null == $this->getSearchName()) {
+            PMA_Util::mysqlDie(
+                __('Please provide a name for this bookmarked search.')
+            );
+        }
+
         if (null == $this->getUsername()
             || null == $this->getDbname()
             || null == $this->getSearchName()
             || null == $this->getCriterias()
         ) {
             PMA_Util::mysqlDie(
-                __('Missing information to save the search bookmark.')
+                __('Missing information to save the bookmarked search.')
             );
         }