diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-07 18:30:47 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-07 18:30:47 -0800 |
| commit | 26aaa62048dbeac60845bed17f81b006561301ca (patch) | |
| tree | c3cc99abf1cc56e39b9ed19b9f2f5f817d7e2faa /Zotlabs | |
| parent | c427fe94dae41a6c2899d426cfd0945f93347b56 (diff) | |
| parent | 7cd7837e08dfedd4e4768703f3b81ef731221deb (diff) | |
| download | volse-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
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Settings/Display.php | 4 |
1 files changed, 2 insertions, 2 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 +} |