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
7 changes: 1 addition & 6 deletions Classes/Backend/Controller/PageEditController.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,8 @@ private function iframeUrl(ServerRequestInterface $request, SiteLanguage $siteLa
$parameters['ADMCMD_prev'] = 'IGNORE';
}

$translatedPageRecord = $this->pageRecord->getRawRecord()->toArray();
if ($siteLanguage->getLanguageId() > 0) {
$translatedPageRecord = $this->getLocalizedPageRecord($siteLanguage->getLanguageId()) ?? $this->pageRecord->getRawRecord()->toArray();
}

return $site->getRouter($context)->generateUri(
$translatedPageRecord,
$this->pageRecord->getRawRecord()->toArray(),
$parameters,
'',
RouterInterface::ABSOLUTE_URL,
Expand Down
8 changes: 8 additions & 0 deletions Tests/Functional/Backend/Controller/Fixtures/pages.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"pages"
,"uid","pid","title","doktype","is_siteroot","deleted","hidden","perms_everybody","slug","sys_language_uid","l10n_parent"
,1,0,"Root",1,1,0,0,15,"/",0,0
,2,1,"Page",1,0,0,0,15,"/page",0,0
,3,1,"Translated page",1,0,0,0,15,"/translated-page",1,2
"be_users"
,"uid","pid","tstamp","username","password","admin","disable","starttime","endtime","options","crdate","workspace_perms","deleted","TSconfig","lastlogin","workspace_id"
,1,0,1366642540,"admin","$1$tCrlLajZ$C0sikFQQ3SWaFAZ1Me0Z/1",1,0,0,0,0,1366642540,1,0,,1371033743,0
76 changes: 76 additions & 0 deletions Tests/Functional/Backend/Controller/PageEditControllerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?php

declare(strict_types=1);

namespace TYPO3\CMS\VisualEditor\Tests\Functional\Backend\Controller;

use PHPUnit\Framework\Attributes\Test;
use Psr\Http\Message\UriInterface;
use ReflectionMethod;
use TYPO3\CMS\Backend\Module\ModuleData;
use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
use TYPO3\CMS\Core\Site\Entity\Site;
use TYPO3\CMS\Frontend\Page\CacheHashCalculator;
use TYPO3\CMS\VisualEditor\Backend\Controller\PageEditController;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;

final class PageEditControllerTest extends FunctionalTestCase
{
protected array $testExtensionsToLoad = [
'typo3conf/ext/visual_editor',
];

protected function setUp(): void
{
parent::setUp();
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
$backendUser = $this->setUpBackendUser(1);
$GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->createFromUserPreferences($backendUser);
}

#[Test]
public function translatedIframeUrlUsesDefaultPageUidForCacheHash(): void
{
$site = new Site('test', 1, [
'base' => 'https://example.com/',
'languages' => [
[
'languageId' => 0,
'title' => 'English',
'locale' => 'en_US.UTF-8',
'base' => '/',
],
[
'languageId' => 1,
'title' => 'German',
'locale' => 'de_DE.UTF-8',
'base' => '/de/',
],
],
]);
$request = (new ServerRequest('https://example.com/typo3/module/web/edit'))
->withAttribute('site', $site)
->withAttribute('moduleData', new ModuleData('web_edit', ['languages' => [1]]))
->withQueryParams([
'id' => 2,
'params' => ['testing' => ['value' => 1]],
]);
$subject = $this->get(PageEditController::class);
(new ReflectionMethod($subject, 'initialize'))->invoke($subject, $request);

/** @var UriInterface $iframeUrl */
$iframeUrl = (new ReflectionMethod($subject, 'iframeUrl'))->invoke($subject, $request, $site->getLanguageById(1));
parse_str($iframeUrl->getQuery(), $queryParameters);
$expectedCacheHash = $this->get(CacheHashCalculator::class)->generateForParameters(http_build_query([
'id' => 2,
'testing' => ['value' => 1],
'editMode' => 1,
]));

self::assertSame('/de/translated-page', $iframeUrl->getPath());
self::assertSame('1', $queryParameters['editMode']);
self::assertSame(['value' => '1'], $queryParameters['testing']);
self::assertSame($expectedCacheHash, $queryParameters['cHash']);
}
}