bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into newui

Browse source
This commit is contained in:
Fabio Comuni 2011-09-26 11:42:48 +02:00
commit 5792b3d358
246 changed files with 7155 additions and 12678 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/theme/dispy/jot-header.tpl
View file

@ -163,7 +163,7 @@ function initEditor(cb) {
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) {
$.get('parse_url?binurl=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
});

2
view/theme/dispy/jot.tpl
View file

@ -9,7 +9,7 @@
</div>
<form id="profile-jot-form" action="$action" method="post" >
<input type="hidden" name="type" value="wall" />
<input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="$defloc" />