updated core and some modules

2017-02-27 13:42:16 +01:00
parent 8a300d7d79
commit b38c8e71d1
228 changed files with 2503 additions and 750 deletions
@@ -57,9 +57,10 @@ function search_view($module = NULL, $keys = '') {
    }
    // Only search if there are keywords or non-empty conditions.
    if ($keys || !empty($conditions)) {
-      // Log the search keys.
-      watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), WATCHDOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
-
+       if (variable_get('search_logging', TRUE)) {
+         // Log the search keys.
+         watchdog('search', 'Searched %type for %keys.', array('%keys' => $keys, '%type' => $info['title']), WATCHDOG_NOTICE, l(t('results'), 'search/' . $info['path'] . '/' . $keys));
+       }
      // Collect the search results.
      $results = search_data($keys, $info['module'], $conditions);
    }