Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:

1 files changed, 10 insertions, 0 deletions

diff --git a/mod/admin.php b/mod/admin.php
index 8caa76370..a395027c1 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -222,6 +222,11 @@ function admin_page_site_post(&$a){
 				`poco`    = replace(`poco`   , 'http:' , 'https:')
 				where `self` = 1"
 			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'http:' , 'https:'),
+				`thumb`   = replace(`thumb`  , 'http:' , 'https:')
+				where 1 "
+			);
 		}
 		elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
 			q("update `contact` set 
@@ -236,6 +241,11 @@ function admin_page_site_post(&$a){
 				`poco`    = replace(`poco`   , 'https:' , 'http:')
 				where `self` = 1"
 			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'https:' , 'http:'),
+				`thumb`   = replace(`thumb`  , 'https:' , 'http:')
+				where 1 "
+			);
 		}
 	}
 	set_config('system','ssl_policy',$ssl_policy);