Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Identities

Browse source
This commit is contained in:
RainLoop Team 2014-11-16 21:49:45 +04:00
parent 7aa8dcea6b
commit cb50320db4
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Common/HtmlEditor.js
View file

@ -8,7 +8,6 @@
_ = require('_'), _ = require('_'),
Globals = require('Common/Globals'), Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Settings = require('Storage/Settings') Settings = require('Storage/Settings')
; ;

2
package.json
View file

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

8
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -1879,7 +1879,7 @@ class Actions
if (isset($aItem['Id'], $aItem['Email'], $aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']) && if (isset($aItem['Id'], $aItem['Email'], $aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']) &&
$aItem['Id'] !== $oAccount->Email()) $aItem['Id'] !== $oAccount->Email())
{ {
$oItem = \RainLoop\Identity::NewInstance($aItem['Id'], $aItem['Email'], $oItem = \RainLoop\Model\Identity::NewInstance($aItem['Id'], $aItem['Email'],
$aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']); $aItem['Name'], $aItem['ReplyTo'], $aItem['Bcc']);
$aIdentities[] = $oItem; $aIdentities[] = $oItem;
@ -1901,7 +1901,7 @@ class Actions
$aIdentities = array(); $aIdentities = array();
if ($oAccount) if ($oAccount)
{ {
$oAccountIdentity = \RainLoop\Identity::NewInstance('', $oAccount->Email()); $oAccountIdentity = \RainLoop\Model\Identity::NewInstance('', $oAccount->Email());
$aSubIdentities = array(); $aSubIdentities = array();
$oSettings = $this->SettingsProvider()->Load($oAccount); $oSettings = $this->SettingsProvider()->Load($oAccount);
@ -1923,7 +1923,7 @@ class Actions
{ {
if (0 < \strlen($aItem['Id'])) if (0 < \strlen($aItem['Id']))
{ {
$oItem = \RainLoop\Identity::NewInstance($aItem['Id'], $aItem['Email']); $oItem = \RainLoop\Model\Identity::NewInstance($aItem['Id'], $aItem['Email']);
} }
else else
{ {
@ -2129,7 +2129,7 @@ class Actions
if (!$oEditIdentity) if (!$oEditIdentity)
{ {
$aIdentities[] = \RainLoop\Identity::NewInstance($sId, $sEmail, $sName, $sReplyTo, $sBcc); $aIdentities[] = \RainLoop\Model\Identity::NewInstance($sId, $sEmail, $sName, $sReplyTo, $sBcc);
} }
else else
{ {