Update to v11.x-dev (current master)

Remove some none compatible and none used extensions like feedit and
components like secure web.

Remove private folder, due to missing secure web.
This commit is contained in:
Daniel Siepmann 2021-05-06 14:57:42 +02:00
parent f12bbddcc7
commit c2db0f8761
5 changed files with 4 additions and 12 deletions

View file

@ -21,6 +21,7 @@ namespace DanielSiepmann\DsSite\Frontend\RssFeed;
* 02110-1301, USA.
*/
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Seo\XmlSitemap\XmlSitemapRenderer as Typo3XmlSitemapRenderer;
@ -31,7 +32,7 @@ class XmlSitemapRenderer extends Typo3XmlSitemapRenderer
*/
public $cObj;
public function render(string $_, array $typoScriptConfiguration): string
public function render(string $_, array $typoScriptConfiguration, ServerRequestInterface $request): string
{
$settings = [];
foreach (array_keys($typoScriptConfiguration['userFunc.']['variables.'] ?? []) as $variableName) {
@ -45,6 +46,6 @@ class XmlSitemapRenderer extends Typo3XmlSitemapRenderer
}
$this->view->assign('settings', $settings);
return parent::render($_, $typoScriptConfiguration);
return parent::render($_, $typoScriptConfiguration, $request);
}
}

View file

@ -1,4 +1,3 @@
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'
@import 'EXT:feedit/Configuration/TypoScript/setup.typoscript'
@import 'EXT:ds_site/Configuration/TypoScript/Setup/'
@import 'EXT:ds_site/Configuration/TypoScript/Setup/ContentElements/'

View file

@ -1,8 +0,0 @@
.typo3-feedit-element {
margin-top: $spacer * 3;
}
.typo3-editPanel-btn .icon {
height: 1em;
width: 1em;
background: $blue-dark;
}

View file

@ -12,7 +12,6 @@
@import "layout";
@import "components/codeHighlighting";
@import "components/feedit";
@import "components/adminpanel";
@import "components/ckeditor";
@import "components/admonition";

View file

@ -1,4 +1,5 @@
{
"private": true,
"scripts": {
"build": "gulp default",
"watch": "gulp watch"