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

* remotes/upstream/master:
  compare ssl_policy precisely in case somebody was bitten by template processor bug
  template processor broken with foreach k=>v and k is integer 0

* master:

3 files changed, 4 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index 836900fc4..b0a631170 100755
--- a/boot.php
+++ b/boot.php
@@ -385,7 +385,7 @@ class App {
 		$scheme = $this->scheme;
 
 		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-			if($this->config['system']['ssl_policy'] == SSL_POLICY_FULL) 
+			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.
diff --git a/include/template_processor.php b/include/template_processor.php
index 7f7b0b55b..93bf391c5 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -96,7 +96,7 @@
 				$this->_push_stack();
 				$r = $this->r;
 				$r[$varname] = $v;
-				if ($keyname!='') $r[$keyname] = $k;
+				if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
 				$ret .=  $this->replace($args[3], $r);
 				$this->_pop_stack();
 			}
diff --git a/mod/admin.php b/mod/admin.php
index 88ccad6d3..a64b26903 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -308,7 +308,7 @@ function admin_page_site(&$a) {
 		SSL_POLICY_FULL => t("Force all links to use SSL"),
 		SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
 	);
-	
+
 	$t = get_markup_template("admin_site.tpl");
 	return replace_macros($t, array(
 		'$title' => t('Administration'),
@@ -325,7 +325,7 @@ function admin_page_site(&$a) {
 		'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
-		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), get_config('system','ssl_policy'), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
 		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),