aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/script.js
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2011-07-26 11:46:49 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:12 +0200
commit149daa0e4fbe5bf59a613caf850ecda083cc772a (patch)
treebecdc86f5b180712b147f48526712a2bdf4d8a7e /phpBB/styles/script.js
parent7ccc18297af17dbc66fc5a28710af6970a17fb6e (diff)
downloadforums-149daa0e4fbe5bf59a613caf850ecda083cc772a.tar
forums-149daa0e4fbe5bf59a613caf850ecda083cc772a.tar.gz
forums-149daa0e4fbe5bf59a613caf850ecda083cc772a.tar.bz2
forums-149daa0e4fbe5bf59a613caf850ecda083cc772a.tar.xz
forums-149daa0e4fbe5bf59a613caf850ecda083cc772a.zip
[feature/ajax] Added code to avoid conflicts with other libraries using $
PHPBB3-10270
Diffstat (limited to 'phpBB/styles/script.js')
-rw-r--r--phpBB/styles/script.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/styles/script.js b/phpBB/styles/script.js
index 0b2d372db7..66e99a6a63 100644
--- a/phpBB/styles/script.js
+++ b/phpBB/styles/script.js
@@ -1,3 +1,6 @@
+;(function($) { //avoid conflicts with other libraries
+
+
$.querystring = function(string) {
var end = {}, i;
@@ -345,3 +348,6 @@ phpbb.ajaxify({
return !(d == 'lock' || d == 'unlock' || d == 'delete_topic' || d.slice(0, 5) == 'make_');
}
}, true);
+
+
+})(jQuery); //avoid conflicts with other libraries