Skip to content

Fix passing null to parameter error, and avoids array to string conve… #79

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix passing null to parameter error, and avoids array to string conve… #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions Model/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,14 @@ public function escapeJsQuote($data, $quote = '\'')

/**
* @param $data
* @return string
* @return array|string|null
*/
public function escapeReturn($data)
{
return trim(str_replace(["\r\n", "\r", "\n"], ' ', $data));
if (!is_null($data) && !is_array($data)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GaryHaddon ... why not

return is_string($data) ? trim(str_replace(["\r\n", "\r", "\n"], ' ', $data)) : $data;

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srenon either works.

return trim(str_replace(["\r\n", "\r", "\n"], ' ', $data));
}
return $data;
}

/**
Expand Down