From f8f3de804a4c402f26a589c04c10c094138115e3 Mon Sep 17 00:00:00 2001
From: Sascha Egerer <sascha@sascha-egerer.de>
Date: Thu, 16 Feb 2017 22:06:43 +0100
Subject: [PATCH] [CLEANUP] Initialize variables in EXT:version
Add some missing variable initialization in EXT:version
Resolves: #79862
Releases: master
Change-Id: I97d8326675d9d90404b99e501e8756ec045c0d90
Reviewed-on: https://review.typo3.org/51722
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Thomas Hohn <thomas@hohn.dk>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Controller/VersionModuleController.php | 37 ++++++++++++++++++-
.../Classes/Dependency/ElementEntity.php | 2 +-
.../version/Classes/Hook/DataHandlerHook.php | 5 +++
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index fa402cc1b0e9..c0edb8f4878b 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -64,6 +64,36 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
*/
public $content;
+ /**
+ * @var string
+ */
+ public $table;
+
+ /**
+ * @var string
+ */
+ public $details;
+
+ /**
+ * @var string
+ */
+ public $diffOnly;
+
+ /**
+ * @var int
+ */
+ public $uid;
+
+ /**
+ * @var array|bool
+ */
+ public $pageinfo;
+
+ /**
+ * @var bool
+ */
+ public $recordFound;
+
/**
* Accumulated content
*
@@ -110,6 +140,11 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
*/
public $recIndex = [];
+ /**
+ * @var string
+ */
+ public $REQUEST_URI = '';
+
/**
* The name of the module
*
@@ -278,8 +313,8 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
// Diffing:
$diff_1 = GeneralUtility::_POST('diff_1');
$diff_2 = GeneralUtility::_POST('diff_2');
+ $content = '';
if (GeneralUtility::_POST('do_diff')) {
- $content = '';
$content .= '<div class="panel panel-space panel-default">';
$content .= '<div class="panel-heading">' . $lang->getLL('diffing') . '</div>';
if ($diff_1 && $diff_2) {
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index 9f08ebd43103..80778aa20a34 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -352,7 +352,7 @@ class ElementEntity
/**
* Gets the outermost parent element.
*
- * @return ElementEntity
+ * @return ElementEntity|bool
*/
public function getOuterMostParent()
{
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 9d2110a625af..2aabae355217 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -48,6 +48,11 @@ class DataHandlerHook
*/
protected $remappedIds = [];
+ /**
+ * @var \TYPO3\CMS\Workspaces\Service\WorkspaceService
+ */
+ protected $workspaceService;
+
/****************************
***** Cmdmap Hooks ******
****************************/
--
GitLab