Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion app/code/core/Mage/Admin/Model/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ public function login(#[\SensitiveParameter] string $username, #[\SensitiveParam
return null;
}

$user = null;

try {
/** @var Mage_Admin_Model_User $user */
$user = $this->_factory->getModel('admin/user');
Expand Down Expand Up @@ -200,7 +202,7 @@ public function login(#[\SensitiveParameter] string $username, #[\SensitiveParam
$this->_loginFailed($e, $request, $username, $message);
}

return $user ?? null;
return $user;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function render(\Maho\DataObject $row)
if ($data = $this->_getValue($row)) {
try {
$useTimezone = $this->getColumn()->getUseTimezone() ?? true;
$locale = $this->getColumn()->getLocale() ?? null;
$locale = $this->getColumn()->getLocale();

$dateObj = $useTimezone
? Mage::app()->getLocale()->utcToStore(null, $data)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct()
*/
public function getRule()
{
return $this->_rule ?? null;
return $this->_rule;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Helper/Guest.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protected function _loadOrderByCookie($cookie = null)
{
if (!is_null($cookie)) {
$cookieData = explode(':', base64_decode($cookie));
$protectCode = $cookieData[0] ?? null;
$protectCode = $cookieData[0];
$incrementId = $cookieData[1] ?? null;

if (!empty($protectCode) && !empty($incrementId)) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Maho/Ai/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function submitTask(array $data): int
// path in invoke(). Without this the async queue would be a bypass
// around the same guard that protects synchronous calls.
foreach ($data['messages'] ?? [] as $msg) {
if (($msg['role'] ?? null) === 'user') {
if (($msg['role'] ?? '') === 'user') {
$validation = $this->getInputValidator()->validate((string) ($msg['content'] ?? ''));
if (!$validation['safe']) {
throw new Mage_Core_Exception('AI request rejected: ' . $validation['reason']);
Expand Down
88 changes: 51 additions & 37 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading