Skip to content

Add check to Message::getText() to avoid unnecessary argument processing #230

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

Open
nikanderson wants to merge 2 commits into
base: 7.x-1.x
Choose a base branch
from
Open

Add check to Message::getText() to avoid unnecessary argument processing #230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
393823e
Add check to Message::getText() to avoid unnecessary argument processing
nikanderson Jul 10, 2018
3d01cb1
Refactor key check for diff compactness and early return per amitaibu
nikanderson Jul 10, 2018
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
5 changes: 5 additions & 0 deletions includes/message.message.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ class Message extends Entity {
if (!empty($arguments)) {
$args = array();
foreach ($arguments as $key => $value) {
if (strpos($output, $key) === FALSE) {
// The replacement key is not in the output, so save computation.
continue;
}

if (is_array($value) && !empty($value['callback']) && function_exists($value['callback'])) {
// A replacement via callback function.
$value += array('pass message' => FALSE);
Expand Down