Skip to content

fix #3621 【プラグイン】BcBaserHelper->getContentsNameでプラグインのコントローラー名が取得できずdefaultになる件を修正 #4411

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
kaburk wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
+14 −5
Open

fix #3621 【プラグイン】BcBaserHelper->getContentsNameでプラグインのコントローラー名が取得できずdefaultになる件を修正 #4411

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions plugins/baser-core/src/View/Helper/BcBaserHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,8 +743,8 @@ public function getContentsName($detail = false, $options = [])
if (isset($url[1])) $url1 = $url[1];
if (isset($url[2])) $url2 = $url[2];

// 固定ページの場合
if (!BcUtil::isAdminSystem()) {
// 固定ページの場合（プラグインルーティング時を除く）
if (!BcUtil::isAdminSystem() && (!$plugin || $plugin === 'BaserCore')) {
$pageUrl = h($request->getPath());
if ($pageUrl === false) $pageUrl = '/';

Expand All @@ -758,7 +758,7 @@ public function getContentsName($detail = false, $options = [])
$aryUrl = explode('/', $pageUrl);
} else {
// プラグインルーティングの場合
if ((($url1 == '' && in_array($action, ['index', 'mobile_index', 'smartphone_index'])) || ($url1 == $action)) && $url2 != $action && $plugin) {
if ((($url1 == '' && in_array($action, ['index', 'mobile_index', 'smartphone_index'], true)) || ($url1 == $action)) && $url2 != $action && $plugin) {
$prefix = $plugin = '';
$controller = $url0;
}
Expand Down
13 changes: 11 additions & 2 deletions plugins/baser-core/tests/TestCase/View/Helper/BcBaserHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,17 @@ public function testGetContentsName($expects, $url, $detail = false, $options =

if (!empty($options['language'])){
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $options['language'];
unset($options['device']);
unset($options['language']);
}

$request = $this->getRequest($url);
if (!empty($options['requestParams'])) {
$request = $request->withAttribute('params', array_merge((array) $request->getAttribute('params'), $options['requestParams']));
unset($options['requestParams']);
}

$this->BcBaser = new BcBaserHelper(new View());
$this->BcBaser->getView()->setRequest($this->getRequest($url));
$this->BcBaser->getView()->setRequest($request);

if (!empty($options['error'])) {
$reflectionClass = new ReflectionClass(get_class($this->BcBaser->getView()));
Expand Down Expand Up @@ -616,6 +622,9 @@ public static function getContentsNameDataProvider()
['Hoge', '/about', false, ['default' => 'Hoge']],
['service_service1', '/service/service1', true, ['underscore' => true]],
['Error!!!', '/', false, ['error' => 'Error!!!']],
// プラグイン（フロント）
['MailMessages', '/mail_messages', false, ['requestParams' => ['plugin' => 'BcMail', 'controller' => 'MailMessages', 'action' => 'index']]],
['MailMessagesIndex', '/mail_messages', true, ['requestParams' => ['plugin' => 'BcMail', 'controller' => 'MailMessages', 'action' => 'index']]],
// スマートフォン
['Home', '/s/', false, ['device' => 'iPhone']],
// 英語サイト
Expand Down
Loading