From 149daa0e4fbe5bf59a613caf850ecda083cc772a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 26 Jul 2011 11:46:49 +0100
Subject: [PATCH] [feature/ajax] Added code to avoid conflicts with other
 libraries using $

PHPBB3-10270
---
 phpBB/styles/script.js | 6 ++++++
 1 file changed, 6 insertions(+)

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