diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
| commit | cc264b2d60049a844fe17322fbcb367712a7071f (patch) | |
| tree | f1f069a49dd186d4cf21c37a25fb794d6d53e6f2 /boot.php | |
| parent | b77c5ae61e5a208daf4b9431a730db874c487e32 (diff) | |
| parent | 33c34984e647f48452d53b93b635f6f517a0f392 (diff) | |
| download | volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.gz volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.bz2 volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -48,10 +48,10 @@ require_once('include/AccessList.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.2.2' ); +define ( 'STD_VERSION', '1.2.3' ); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1161 ); +define ( 'DB_UPDATE_VERSION', 1163 ); /** @@ -85,7 +85,8 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.zottel.net', 'https://hub.pixelbits.de', 'https://my.federated.social', - 'https://hubzilla.nl' + 'https://hubzilla.nl', + 'https://blablanet.es' ); @@ -991,6 +992,10 @@ class App { if ($user_scalable === false) $user_scalable = 1; + $preload_images = ((local_channel()) ? get_pconfig(local_channel(),'system','preload_images') : 0); + if ($preload_images === false) + $preload_images = 0; + $interval = ((local_channel()) ? get_pconfig(local_channel(),'system','update_interval') : 80000); if($interval < 10000) $interval = 80000; @@ -1004,6 +1009,7 @@ class App { */ $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl, array( + '$preload_images' => $preload_images, '$user_scalable' => $user_scalable, '$baseurl' => $this->get_baseurl(), '$local_channel' => local_channel(), |