From 453b5b46a370e3f01f2c948ac3eddf0bcd82c741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Sun, 18 Mar 2012 15:44:33 +0000
Subject: CSRF-Protection in the group-related form (creating, renaming and
 dropping a group, adding/removing members from it)

---
 js/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/main.js b/js/main.js
index c20455ad1..babd2a1c3 100755
--- a/js/main.js
+++ b/js/main.js
@@ -486,9 +486,9 @@
         return a.join('');  
     }  
 
-	function groupChangeMember(gid,cid) {
+	function groupChangeMember(gid, cid, sec_token) {
 		$('body .fakelink').css('cursor', 'wait');
-		$.get('group/' + gid + '/' + cid, function(data) {
+		$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
 				$('#group-update-wrapper').html(data);
 				$('body .fakelink').css('cursor', 'auto');				
 		});
-- 
cgit v1.2.3


From 3ad02a749b1ae7db2a92a552a3ed1ffe545ed46f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 21 Mar 2012 05:27:08 -0700
Subject: make autocomplete work with updated tinymce

---
 js/fk.autocomplete.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'js')

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 69fe77e8c..b1db92c41 100755
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -14,22 +14,22 @@ function ACPopup(elm,backend_url){
 	this.kp_timer = false;
 	this.url = backend_url;
 
+	var w = 530;
+	var h = 130;
+
+
 	if(typeof elm.editorId == "undefined") {	
 		style = $(elm).offset();
 		w = $(elm).width();
 		h = $(elm).height();
 	}
 	else {
-		style = $(elm.container).offset();
-		w = elm.container.offsetWidth;
-		h = elm.container.offsetHeight;
-		// Quick fix for chrome until I get a tool to inspect the dom
-		// Chrome returns 0x0
-		if(! w)
-			w = 530;
-		if(! h)
-			h = 130;
-
+		var container = elm.getContainer();
+		if(typeof container != "undefined") {
+			style = $(container).offset();
+			w = $(container).width();
+	    	h = $(container).height();
+		}
 	}
 
 	style.top=style.top+h;
-- 
cgit v1.2.3