summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-02-28 23:55:32 -0800
committerwebchick <webchick@24967.no-reply.drupal.org>2012-02-28 23:55:32 -0800
commitce530cc8b6e32abda1e928720b5f21ada3b7e63f (patch)
treefeef75a748ce834262f0e2f63461dca6b91e084a
parentc8d1e91a860204451d9ce87f4509c2182a337699 (diff)
downloadbrdo-ce530cc8b6e32abda1e928720b5f21ada3b7e63f.tar.gz
brdo-ce530cc8b6e32abda1e928720b5f21ada3b7e63f.tar.bz2
Issue #1425280 by Niklas Fiekas, swentel: Fixed No contextual links in node lists after a node without contextual links.
-rw-r--r--includes/menu.inc2
-rw-r--r--modules/contextual/contextual.info1
2 files changed, 2 insertions, 1 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 52a33a5b0..fef40bb73 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2144,7 +2144,7 @@ function menu_contextual_links($module, $parent_path, $args) {
$links = array();
// Performance: In case a previous invocation for the same parent path did not
// return any links, we immediately return here.
- if (isset($path_empty[$parent_path])) {
+ if (isset($path_empty[$parent_path]) && strpos($parent_path, '%') !== FALSE) {
return $links;
}
// Construct the item-specific parent path.
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index ffaabaf22..5ebc09809 100644
--- a/modules/contextual/contextual.info
+++ b/modules/contextual/contextual.info
@@ -3,3 +3,4 @@ description = Provides contextual links to perform actions related to elements o
package = Core
version = VERSION
core = 7.x
+files[] = contextual.test