Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX : To have only the sender's entity when sending mail #31053

Open
wants to merge 2 commits into
base: 18.0
Choose a base branch
from
+1 −1
Open

FIX : To have only the sender's entity when sending mail #31053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eae10e
fix
Thomas905 Sep 20, 2024
f8beecd
Update html.formmail.class.php
eldy Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion htdocs/core/class/html.formmail.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@

// Add also email aliases from the c_email_senderprofile table
$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";
$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";
$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).") AND entity in (0, ".((int) $conf->entity).")";

Check failure on line 630 in htdocs/core/class/html.formmail.class.php

View workflow job for this annotation

GitHub Actions / pre-commit 

Tabs must be used to indent lines; spaces are not allowed
$sql .= " ORDER BY position";
$resql = $this->db->query($sql);
if ($resql) {
Expand Down
Loading