Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix js error (TypeError: Cannot call method 'settingsGet' of undefined)

Browse source 
+ small other fixes
This commit is contained in:
RainLoop Team 2013-11-21 02:00:30 +04:00
parent cf0968b5a8
commit 726fa6982b
12 changed files with 87 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -5183,7 +5183,7 @@ class Actions
private function setupInformation()
{
$aResult = array(
'hash' => \file_exists(APP_DATA_FOLDER_PATH.'HASH') ? @\file_get_contents(APP_DATA_FOLDER_PATH.'HASH') : '',
'hash' => \file_exists(APP_DATA_FOLDER_PATH.'HASH') ? \md5(@\file_get_contents(APP_DATA_FOLDER_PATH.'HASH')) : '',
'version-full' => APP_VERSION,
);

14
rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -143,12 +143,18 @@ class Service
$aData = $this->startUpData($bAdmin);
$sAppHash = '';
if (\file_exists(APP_DATA_FOLDER_PATH.'HASH'))
{
$sAppHash = md5(@\file_get_contents(APP_DATA_FOLDER_PATH.'HASH'));
}
$bCacheEnabled = $this->oActions->Config()->Get('labs', 'cache_system_data', true);
$sCacheFileName = '';
if ($bCacheEnabled)
{
$sCacheFileName = 'TMPL:'.$aData['Hash'];
$sCacheFileName = 'TMPL:'.$aData['Hash'].'/'.$sAppHash;
$sResult = $this->oActions->Cacher()->Get($sCacheFileName);
}
@ -178,12 +184,6 @@ class Service
$bCached = true;
}
$sAppHash = '';
if (\file_exists(APP_DATA_FOLDER_PATH.'HASH'))
{
$sAppHash = @\file_get_contents(APP_DATA_FOLDER_PATH.'HASH');
}
$sResult .= '<!--';
$sResult .= ' [version:'.APP_VERSION;
$sResult .= '][time:'.substr(\microtime(true) - APP_START, 0, 6);