Merge remote branch 'upstream/master'

1 files changed, 14 insertions, 17 deletions

diff --git a/boot.php b/boot.php
index 634cf28c9..54ab14d63 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1353' );
+define ( 'FRIENDICA_VERSION',      '3.0.1358' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1144      );
+define ( 'DB_UPDATE_VERSION',      1145      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -441,22 +441,19 @@ if(! class_exists('App')) {
 				if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
 					$scheme = 'https';
 
-				//			We need to populate the $ssl flag across the entire program before turning this on.
-				//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
-				//			(and also the login link). Anything seen by an outsider will have it turned off.
-				//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
-				//			contact links to this site with "http:" if they are currently using "https:"
-
-				//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-				//				if($ssl)
-				//					$scheme = 'https';
-				//				else
-				//					$scheme = 'http';
-					//			}
-		}
+				//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
+				//	(and also the login link). Anything seen by an outsider will have it turned off.
+
+				if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+					if($ssl)
+						$scheme = 'https';
+					else
+						$scheme = 'http';
+				}
+			}
 
-				$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-				return $this->baseurl;
+			$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+			return $this->baseurl;
 		}
 
 		function set_baseurl($url) {