Skip to content
Snippets Groups Projects
Commit 9ea058a4 authored by Stefan Galinski's avatar Stefan Galinski :video_game:
Browse files

Merge branch 'backslashinmakeinstance' into 'master'

[BUGFIX] Fix back slashes in makeInstance calls



See merge request !2
parents 26399122 2db48d93
No related branches found
No related tags found
No related merge requests found
......@@ -97,7 +97,7 @@ class BrowseLinksController {
// If type was not rendered, use default rendering functions
if (!$browserRendered) {
$GLOBALS['SOBE']->browser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
'SGalinski\Tinymce4Rte\BrowseLinks'
'SGalinski\\Tinymce4Rte\\BrowseLinks'
);
$GLOBALS['SOBE']->browser->init();
$modData = $GLOBALS['BE_USER']->getModuleData('browse_links.php', 'ses');
......
......@@ -83,7 +83,7 @@ class SelectImageController {
// If type was not rendered, use default rendering functions
if (!$browserRendered) {
$GLOBALS['SOBE']->browser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
'SGalinski\Tinymce4Rte\SelectImage'
'SGalinski\\Tinymce4Rte\\SelectImage'
);
$GLOBALS['SOBE']->browser->init();
$modData = $GLOBALS['BE_USER']->getModuleData('select_image.php', 'ses');
......
......@@ -87,7 +87,7 @@ class RteBase extends AbstractRte {
$userOrPageProperties = BackendUtility::getModTSconfig($thePidValue, 'RTE');
/** @var Loader $tinyMCE */
$tinyMCE = GeneralUtility::makeInstance('\SGalinski\Tinymce\Loader');
$tinyMCE = GeneralUtility::makeInstance('SGalinski\\Tinymce\\Loader');
$tinyMCE->loadConfiguration($userOrPageProperties['properties']['default.']['tinymceConfiguration']);
if ($userOrPageProperties['properties']['default.']['contentCSS'] !== '') {
$contentCssFile = GeneralUtility::getFileAbsFileName(
......
......@@ -794,7 +794,7 @@ class SelectImage extends ElementBrowser {
case 'magic':
// Create folder tree:
$foldertree = GeneralUtility::makeInstance('SGalinski\Tinymce4Rte\FolderTree');
$foldertree = GeneralUtility::makeInstance('SGalinski\\Tinymce4Rte\\FolderTree');
$foldertree->thisScript = $this->thisScript;
$tree = $foldertree->getBrowsableTree();
// Get currently selected folder
......
......@@ -23,6 +23,6 @@
*/
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SGalinski\Tinymce4Rte\Controller\BrowseLinksController');
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SGalinski\\Tinymce4Rte\\Controller\\BrowseLinksController');
$SOBE->main();
$SOBE->printContent();
......@@ -19,6 +19,6 @@
*/
// Make instance:
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SGalinski\Tinymce4Rte\Controller\SelectImageController');
$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SGalinski\\Tinymce4Rte\\Controller\\SelectImageController');
$SOBE->main();
$SOBE->printContent();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment