Skip to content

Commit 90762ba

Browse files
author
Hwashiang Yu
committed
MC-30403: 'What is this ?' button does not work correctly
- Resolved svc test failures
1 parent 827970a commit 90762ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/code/Magento/Backend/Block/Store/Switcher.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ public function getCurrentSelectionName()
462462
/**
463463
* Get current website name
464464
*
465-
* @return string | null
465+
* @return string
466466
*/
467467
public function getCurrentWebsiteName()
468468
{
@@ -474,13 +474,13 @@ public function getCurrentWebsiteName()
474474
}
475475
}
476476

477-
return null;
477+
return '';
478478
}
479479

480480
/**
481481
* Get current store group name
482482
*
483-
* @return string | null
483+
* @return string
484484
*/
485485
public function getCurrentStoreGroupName()
486486
{
@@ -492,13 +492,13 @@ public function getCurrentStoreGroupName()
492492
}
493493
}
494494

495-
return null;
495+
return '';
496496
}
497497

498498
/**
499499
* Get current store view name
500500
*
501-
* @return string | null
501+
* @return string
502502
*/
503503
public function getCurrentStoreName()
504504
{
@@ -510,7 +510,7 @@ public function getCurrentStoreName()
510510
}
511511
}
512512

513-
return null;
513+
return '';
514514
}
515515

516516
/**

0 commit comments

Comments
 (0)