Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 1 insertions, 6 deletions

diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 30bff47d..46ddac52 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,10 +1,5 @@
 $(document).ready(function() {
-  $(".gDigibugPrintButton a").click(function(e) {
-    e.preventDefault();
-    return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-
-  $("#gDigibugLink").click(function(e) {
+  $(".g-print-digibug-link").click(function(e) {
     e.preventDefault();
     return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
   });