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 0000000000000000000000000000000000000000..d85542719bbbced5ade48d8ef89d535f0f262bb6
--- /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 3e8277d06d9edd81f0e5496600c94deefcfa189e..dd9c90fd71ac03fb5fe384b0387c5f397fca1ad5 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);
   }
 }