averello/rainloop-webmail-mirror
1
0
Fork 0
mirror of https://github.com/RainLoop/rainloop-webmail.git synced 2026-02-05 11:34:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed EditorDefaultType filter

Browse Source
This commit is contained in:
RainLoop Team
2014-11-17 22:41:56 +04:00
parent 2feee6d1dd
commit 2d287f0b8d
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.7.0",
"release": "202",
"release": "203",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",

3
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View File

@@ -1403,7 +1403,8 @@ class Actions
$aResult['LangLink'] = './?/Lang/0/'.($bAdmin ? 'en' : $aResult['Language']).'/'.$sStaticCache.'/';
$aResult['TemplatesLink'] = './?/Templates/0/'.($bAdmin ? 'Admin' : 'App').'/'.$sStaticCache.'/';
$aResult['PluginsLink'] = $sPluginsLink;
$aResult['EditorDefaultType'] = 'Html' === $aResult['EditorDefaultType'] ? 'Html' : 'Plain';
$aResult['EditorDefaultType'] = \in_array($aResult['EditorDefaultType'], array('Plain', 'Html', 'HtmlForced', 'PlainForced')) ?
$aResult['EditorDefaultType'] : 'Plain';
// IDN
$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);

4
rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/DefaultSettings.php
View File

@@ -24,7 +24,7 @@ class DefaultSettings implements \RainLoop\Providers\Settings\SettingsInterface
*
* @return array
*/
public function Load(\RainLoop\Model\Account $oAccount)
public function Load($oAccount)
{
$sValue = $this->oStorageProvider->Get($oAccount,
\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
@@ -49,7 +49,7 @@ class DefaultSettings implements \RainLoop\Providers\Settings\SettingsInterface
*
* @return bool
*/
public function Save(\RainLoop\Model\Account $oAccount, array $aSettings)
public function Save($oAccount, array $aSettings)
{
return $this->oStorageProvider->Put($oAccount,
\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,

4
rainloop/v/0.0.0/app/src/RainLoop/Providers/Settings/SettingsInterface.php
View File

@@ -9,7 +9,7 @@ interface SettingsInterface
*
* @return array
*/
public function Load(\RainLoop\Model\Account $oAccount);
public function Load($oAccount);
/**
* @param \RainLoop\Model\Account $oAccount
@@ -17,7 +17,7 @@ interface SettingsInterface
*
* @return bool
*/
public function Save(\RainLoop\Model\Account $oAccount, array $aSettings);
public function Save($oAccount, array $aSettings);
/**
* @param string $sEmail