summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShabanaBlackborder2013-09-04 14:19:02 (GMT)
committer ShabanaBlackborder2013-09-04 14:19:02 (GMT)
commit18b714899436d53b5eaa576f03fbfa257c0920d1 (patch)
tree61e984b1292d7f5f3fde1c74bbb1412c20221be7
parent78e8a479716b4b25fdbb693ca952a37f7a849df8 (diff)
Issue #2068009 by Shabana Blackborder, jiff: Fixed Recoverable fatal error when trying to list badges.
-rw-r--r--user_badges-fix_fatal_error_in_drupal_http_build_query-2068009-8_2.patch16
-rw-r--r--user_badges.module5
2 files changed, 21 insertions, 0 deletions
diff --git a/user_badges-fix_fatal_error_in_drupal_http_build_query-2068009-8_2.patch b/user_badges-fix_fatal_error_in_drupal_http_build_query-2068009-8_2.patch
new file mode 100644
index 0000000..d855427
--- /dev/null
+++ b/user_badges-fix_fatal_error_in_drupal_http_build_query-2068009-8_2.patch
@@ -0,0 +1,16 @@
+diff --git a/user_badges.module b/user_badges.module
+index 53f6f2c..fc62e5a 100644
+--- a/user_badges.module
++++ b/user_badges.module
+@@ -1244,6 +1244,11 @@ function theme_user_badge($variables) {
+ $pieces['path'] = $pieces['scheme'] . '://' . $pieces['host'] . $pieces['path'];
+ }
+
++ // We need to convert the query to an associative array before we pass it
++ // to the l() function.
++ if (isset($pieces['query'])) {
++ $pieces['query'] = drupal_get_query_array($pieces['query']);
++ }
+ return l($image, $pieces['path'], $pieces);
+ }
+ }
diff --git a/user_badges.module b/user_badges.module
index 3e8277d..dd9c90f 100644
--- a/user_badges.module
+++ b/user_badges.module
@@ -1244,6 +1244,11 @@ function theme_user_badge($variables) {
$pieces['path'] = $pieces['scheme'] . '://' . $pieces['host'] . $pieces['path'];
}
+ // We need to convert the query to an associative array before we pass it
+ // to the l() function.
+ if (isset($pieces['query'])) {
+ $pieces['query'] = drupal_get_query_array($pieces['query']);
+ }
return l($image, $pieces['path'], $pieces);
}
}