aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-07 18:30:47 -0800
committerzotlabs <mike@macgirvin.com>2016-11-07 18:30:47 -0800
commit26aaa62048dbeac60845bed17f81b006561301ca (patch)
treec3cc99abf1cc56e39b9ed19b9f2f5f817d7e2faa
parentc427fe94dae41a6c2899d426cfd0945f93347b56 (diff)
parent7cd7837e08dfedd4e4768703f3b81ef731221deb (diff)
downloadvolse-hubzilla-26aaa62048dbeac60845bed17f81b006561301ca.tar.gz
volse-hubzilla-26aaa62048dbeac60845bed17f81b006561301ca.tar.bz2
volse-hubzilla-26aaa62048dbeac60845bed17f81b006561301ca.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Module/Settings/Display.php4
-rwxr-xr-xboot.php4
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)