Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

1 files changed, 4 insertions, 7 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
index f67a5bc82..53ff409e7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -31,7 +31,7 @@ var LinkDialog = {
 	},

 

 	update : function() {

-		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;

+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');

 

 		tinyMCEPopup.restoreSelection();

 		e = ed.dom.getParent(ed.selection.getNode(), 'A');

@@ -39,7 +39,6 @@ var LinkDialog = {
 		// Remove element if there is no href

 		if (!f.href.value) {

 			if (e) {

-				tinyMCEPopup.execCommand("mceBeginUndoLevel");

 				b = ed.selection.getBookmark();

 				ed.dom.remove(e, 1);

 				ed.selection.moveToBookmark(b);

@@ -49,19 +48,17 @@ var LinkDialog = {
 			}

 		}

 

-		tinyMCEPopup.execCommand("mceBeginUndoLevel");

-

 		// Create new anchor elements

 		if (e == null) {

 			ed.getDoc().execCommand("unlink", false, null);

-			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+			tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});

 

 			tinymce.each(ed.dom.select("a"), function(n) {

 				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {

 					e = n;

 

 					ed.dom.setAttribs(e, {

-						href : f.href.value,

+						href : href,

 						title : f.linktitle.value,

 						target : f.target_list ? getSelectValue(f, "target_list") : null,

 						'class' : f.class_list ? getSelectValue(f, "class_list") : null

@@ -70,7 +67,7 @@ var LinkDialog = {
 			});

 		} else {

 			ed.dom.setAttribs(e, {

-				href : f.href.value,

+				href : href,

 				title : f.linktitle.value,

 				target : f.target_list ? getSelectValue(f, "target_list") : null,

 				'class' : f.class_list ? getSelectValue(f, "class_list") : null