2 files changed, 8 insertions, 0 deletions
diff --git a/modules/search/search.module b/modules/search/search.module
index d6e6350ae..1f4238797 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -210,6 +210,7 @@ function search_menu() {
       );
       $items["$path/%menu_tail"] = array(
         'title' => $search_info['title'],
+        'load arguments' => array('%map', '%index'),
         'page callback' => 'search_view',
         'page arguments' => array($module, 2),
         'access callback' => '_search_menu_access',
diff --git a/modules/search/search.test b/modules/search/search.test
index 35f363a67..78c3cfae2 100644
--- a/modules/search/search.test
+++ b/modules/search/search.test
@@ -279,6 +279,13 @@ class SearchPageText extends DrupalWebTestCase {
     $this->drupalPost('search/user', $edit, t('Search'));
     $this->assertText(t('Search'));
     $this->assertTitle($title, 'Search page title is correct');
+
+    // Test that search keywords containing slashes are correctly loaded
+    // from the path and displayed in the search form.
+    $arg = $this->randomName() . '/' . $this->randomName();
+    $this->drupalGet('search/node/' . $arg);
+    $input = $this->xpath("//input[@id='edit-keys' and @value='{$arg}']");
+    $this->assertFalse(empty($input), 'Search keys with a / are correctly set as the default value in the search box.');
   }
 }