From 7ceba61413ec3cc63112471e89f346ac1613d928 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:29:02 -0400
Subject: Revert "bugfix for #1098 (assigning a group to a user, the group
 appears incrementally many times the more you assign it)"

This reverts commit 265d7e50f55978a3bebfa077aa8552d5ea1b0c59.
---
 settings/js/users.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index 90569bcc56b..c04df81d82f 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -221,6 +221,5 @@ $(document).ready(function(){
 				}
 			}
 		);
-	    location.reload();
 	});
 });
-- 
cgit v1.2.3


From eca2e073f812c89712c74f8626816c29a449232f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:53:29 -0400
Subject: Don't reload the page after sending private link to email address

---
 apps/files_sharing/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 9194d2240ab..39e6bd78590 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -360,7 +360,8 @@ $(document).ready(function() {
 		$(this).select();
 	});
 
-	$('#emailPrivateLink').live('submit', function() {
+	$('#emailPrivateLink').live('submit', function(event) {
+		event.preventDefault();
 		OC.Share.emailPrivateLink();
 	});
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 5ff72f2cd7559ba39ad4f0a255debc02f38d4430 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:50:53 +0200
Subject: fix a small PHP fail

---
 lib/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index 4acbc5dcebc..b21829e91fd 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -115,7 +115,7 @@ class OC_L10N{
 			// (Just no need to define date/time format etc. twice)
 			if(file_exists($i18ndir.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
-				include($i18ndir.$lang.'.php');
+				include(strip_tags($i18ndir).strip_tags($lang).'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
 					$this->translations = $TRANSLATIONS;
 				}
-- 
cgit v1.2.3