Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

2 files changed, 4 insertions, 4 deletions

diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php
index d03b64db7..25d1d21a0 100644
--- a/Zotlabs/Module/Settings/Display.php
+++ b/Zotlabs/Module/Settings/Display.php
@@ -159,7 +159,7 @@ class Display {
 		$preload_images = (($preload_images===false)? '0': $preload_images); // default if not set: 0
 	
 		$user_scalable = get_pconfig(local_channel(),'system','user_scalable');
-		$user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1
+		$user_scalable = (($user_scalable===false)? '0': $user_scalable); // default if not set: 0
 			
 		$browser_update = intval(get_pconfig(local_channel(), 'system','update_interval'));
 		$browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds
@@ -240,4 +240,4 @@ class Display {
 
 
 			
-}
\ No newline at end of file
+}
diff --git a/boot.php b/boot.php
index c52f844e1..1c558ef70 100755
--- a/boot.php
+++ b/boot.php
@@ -1135,9 +1135,9 @@ class App {
 
 	public static function build_pagehead() {
 
-		$user_scalable = ((local_channel()) ? get_pconfig(local_channel(),'system','user_scalable') : 1);
+		$user_scalable = ((local_channel()) ? get_pconfig(local_channel(),'system','user_scalable') : 0);
 		if ($user_scalable === false)
-			$user_scalable = 1;
+			$user_scalable = 0;
 
 		$preload_images = ((local_channel()) ? get_pconfig(local_channel(),'system','preload_images') : 0);
 		if ($preload_images === false)