Commit 55933f5a authored by Carsten  Rose's avatar Carsten Rose
Browse files

Drag'n'Drop broken: after refactoring Support.php, the drag'n'drop was broken...

Drag'n'Drop broken: after refactoring Support.php, the drag'n'drop was broken - '$store' wasn't initialized.
parent efe1b48d
Pipeline #2879 passed with stages
in 3 minutes and 34 seconds
...@@ -34,9 +34,7 @@ class Support { ...@@ -34,9 +34,7 @@ class Support {
*/ */
public static function appendTypo3ParameterToArray(array &$queryArray, $mode = PARAM_T3_ALL) { public static function appendTypo3ParameterToArray(array &$queryArray, $mode = PARAM_T3_ALL) {
if (!isset(self::$store)) { self::$store = Store::getInstance();
self::$store = Store::getInstance();
}
if ($mode === PARAM_T3_ALL) { if ($mode === PARAM_T3_ALL) {
$queryArray['id'] = self::$store->getVar(TYPO3_PAGE_ID, STORE_TYPO3); $queryArray['id'] = self::$store->getVar(TYPO3_PAGE_ID, STORE_TYPO3);
...@@ -65,9 +63,13 @@ class Support { ...@@ -65,9 +63,13 @@ class Support {
* @return string * @return string
* @throws \CodeException * @throws \CodeException
* @throws \UserFormException * @throws \UserFormException
* @throws \UserReportException
*/ */
public static function appendTypo3ParameterToUrl($uri) { public static function appendTypo3ParameterToUrl($uri) {
self::$store = Store::getInstance();
if ($uri == '') { if ($uri == '') {
return ''; return '';
} }
...@@ -105,9 +107,7 @@ class Support { ...@@ -105,9 +107,7 @@ class Support {
*/ */
public static function getFormLogFileName($formName, $formLogMode) { public static function getFormLogFileName($formName, $formLogMode) {
if (!isset(self::$store)) { self::$store = Store::getInstance();
self::$store = Store::getInstance();
}
switch ($formLogMode) { switch ($formLogMode) {
case FORM_LOG_ALL: case FORM_LOG_ALL:
...@@ -1465,7 +1465,6 @@ class Support { ...@@ -1465,7 +1465,6 @@ class Support {
} }
} }
/** /**
* @param $mode * @param $mode
* @param $data * @param $data
...@@ -1554,9 +1553,12 @@ class Support { ...@@ -1554,9 +1553,12 @@ class Support {
* @return array|string * @return array|string
* @throws \CodeException * @throws \CodeException
* @throws \UserFormException * @throws \UserFormException
* @throws \UserReportException
*/ */
public static function getFormModeGlobal($mode) { public static function getFormModeGlobal($mode) {
self::$store = Store::getInstance();
$formModeGlobal = self::$store->getVar(F_MODE_GLOBAL, STORE_USER); $formModeGlobal = self::$store->getVar(F_MODE_GLOBAL, STORE_USER);
if ($formModeGlobal === '' || $formModeGlobal === false) { if ($formModeGlobal === '' || $formModeGlobal === false) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment