diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-25 13:01:23 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-25 13:01:23 +0100 |
| commit | 673cf8d35e224fcbbc0caef5e638c08bc3914feb (patch) | |
| tree | 6056bbadaf19fb8eefbf47003fed1e6bcea36c09 /view | |
| parent | fed61c082c8f9d6a7673125bd365d44d4b409fa4 (diff) | |
| parent | d406e2aae20f20a7df6fc77d9317323de043c0f6 (diff) | |
| download | volse-hubzilla-673cf8d35e224fcbbc0caef5e638c08bc3914feb.tar.gz volse-hubzilla-673cf8d35e224fcbbc0caef5e638c08bc3914feb.tar.bz2 volse-hubzilla-673cf8d35e224fcbbc0caef5e638c08bc3914feb.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_profile_photo.js | 4 | ||||
| -rwxr-xr-x | view/tpl/profile_photo.tpl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js index 76b120684..832da764b 100644 --- a/view/js/mod_profile_photo.js +++ b/view/js/mod_profile_photo.js @@ -37,7 +37,9 @@ $.post("embedphotos/photolink", {href: href}, function(ddata) { if (ddata['status']) { - window.location.href = 'profile_photo/use/' + ddata['resource_id']; + var pf = $('#profile-photo-profiles').val(); + var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : ''); + window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof; } else { window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); } diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 1f468c2e5..832f135f3 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -27,7 +27,7 @@ <label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> <select name="profile" id="profile-photo-profiles" class="form-control" > {{foreach $profiles as $p}} - <option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> + <option value="{{$p.id}}" {{if $p.selected}}selected="selected"{{/if}}>{{$p.name}}</option> {{/foreach}} </select> <div class="clear"></div> |