Merge remote-tracking branch 'upstream/master'

3 files changed, 5 insertions, 12 deletions

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index d2562f080..15505397b 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -12,6 +12,7 @@
 <input type="hidden" name="event_hash" value="{{$event_hash}}" />
 <input type="hidden" name="xchan" value="{{$xchan}}" />
 <input type="hidden" name="mid" value="{{$mid}}" />
+<input type="hidden" name="type" value="{{$type}}" />
 <input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
 <div id="event-summary-text">{{$t_text}}</div>
@@ -92,14 +93,6 @@
 	</div>
 	
 	</div>
-					
-<!--	<div class="btn-group pull-right" id="comment-edit-submit-wrapper-desc">
-	{{if $preview}}
-	<button id="comment-edit-submit-desc" class="btn btn-default btn-xs" onclick="preview_comment(desc); return false;" title="{{$preview}}">
-		<i class="icon-eye-open comment-icon" ></i>
-	</button>
-	{{/if}}
--->
 </div>
 
 <div class="clear"></div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 4121882b7..424d856e3 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -191,7 +191,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').spin('tiny');
-			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/urlinfo?f=&binurl=' + reply, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').spin(false);
 			});
@@ -258,7 +258,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').spin('tiny');
-			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/urlinfo?f=&binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index e1d1c6d23..20d0dd914 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -78,7 +78,7 @@ else
 		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			$('#prvmail-rotator').spin('tiny');
-			$.get('parse_url?url=' + reply, function(data) {
+			$.get('urlinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
 				$('#prvmail-rotator').spin(false);
 			});
@@ -104,7 +104,7 @@ else
 		event.preventDefault();
 		if(reply && reply.length) {
 			$('#prvmail-rotator').spin('tiny');
-			$.get('parse_url?url=' + reply, function(data) {
+			$.get('urlinfo?f=&url=' + reply, function(data) {
 				addmailtext(data);
 				$('#prvmail-rotator').spin(false);
 			});