From: Friendika <info@friendika.com>
Date: Mon, 14 Feb 2011 12:46:49 +0000 (-0800)
Subject: Merge branch 'ajaxcomms'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b87ddbd58aa2739521282f44a463be53c6397231;p=friendica.git

Merge branch 'ajaxcomms'

Conflicts:
	view/comment_item.tpl
---

b87ddbd58aa2739521282f44a463be53c6397231
diff --cc view/comment_item.tpl
index 1b1f3a49e9,068cf07318..885d735eda
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@@ -1,9 -1,9 +1,9 @@@
  		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
- 			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" >
 -			<form class="comment-edit-form" id="comment-edit-form-$id" method="post" onsubmit="post_comment($id); return false;">
 -				<input id="f-type-$id" type="hidden" name="type" value="$type" />
 -				<input id="f-profile-uid-$id" type="hidden" name="profile_uid" value="$profile_uid" />
 -				<input id="f-parent-$id" type="hidden" name="parent" value="$parent" />
 -				<input id="f-return-path-$id" type="hidden" name="return" value="$return_path" />
++			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 +				<input type="hidden" name="type" value="$type" />
 +				<input type="hidden" name="profile_uid" value="$profile_uid" />
 +				<input type="hidden" name="parent" value="$parent" />
 +				<input type="hidden" name="return" value="$return_path" />
  
  				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
  					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>