From 3153129e2eb968a189a8a7050d06892cbc13c651 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 24 Feb 2018 13:20:59 -0800
Subject: make the profile photo image picker work correctly with multiple
 profiles.

---
 view/js/mod_profile_photo.js | 4 +++-
 view/tpl/profile_photo.tpl   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'view')

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>
-- 
cgit v1.2.3