Merge pull request #7 from nitsan-technologies/feature/stability-v11

Feature/stability v11
nitsan-technologies · Aug 30, 2024 · de8514d · de8514d
2 parents 648e57f + ca6d877
commit de8514d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 32 deletions.
diff --git a/Classes/Controller/CommentController.php b/Classes/Controller/CommentController.php
@@ -138,7 +138,7 @@ public function listAction()
         $pid = $GLOBALS['TSFE']->id;
         $setting = $this->settings;
         if ($pid) {
-            $comments = $this->commentRepository->getCommentsByPage($pid,$setting['commnetlanguageFallbackMode'])->toArray();
+            $comments = $this->commentRepository->getCommentsByPage($pid)->toArray();
             $paths = $this->captchaVerificationPath();
 
             $captcha_path = $paths['captcha'] . '?' . rand();

diff --git a/Classes/Domain/Repository/CommentRepository.php b/Classes/Domain/Repository/CommentRepository.php
@@ -39,23 +39,14 @@ class CommentRepository extends Repository
      *
      * @param $pageId
      */
-    public function getCommentsByPage($pageId, $mode)
+    public function getCommentsByPage($pageId)
     {
-        if (version_compare(TYPO3_branch, '9.0', '>')) {
-            $context = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Context\Context::class);
-            $languageId = $context->getPropertyFromAspect('language', 'id');
-        } else {
-            $languageId = $GLOBALS['TSFE']->sys_language_uid;
-        }
+
         $query = $this->createQuery();
         $queryArr = [
             $query->equals('pageuid', $pageId),
             $query->equals('comment', 0),
         ];
-        if ($mode > 0) {
-            $query->getQuerySettings()->setRespectSysLanguage(false);
-            $queryArr[] = $query->equals('sys_language_uid', $languageId);
-        }
         $query->matching($query->logicalAnd($queryArr));
         $query->setOrderings(['crdate' => QueryInterface::ORDER_DESCENDING]);
         $query->getQuerySettings()->setRespectStoragePage(false);

diff --git a/Configuration/FlexForm/FlexForm.xml b/Configuration/FlexForm/FlexForm.xml
@@ -15,25 +15,6 @@
 				</TCEforms>
 				<type>array</type>
 				<el>
-					<settings.commnetlanguageFallbackMode>
-						<TCEforms>
-							<label>LLL:EXT:ns_comments/Resources/Private/Language/locallang_db.xlf:flexform.languageFallbackMode</label>
-							<config>
-								<type>radio</type>
-								<items>
-									<numIndex index="0">
-										<numIndex index="0">LLL:EXT:ns_comments/Resources/Private/Language/locallang_db.xlf:flexform.languageFallbackMode.strict</numIndex>
-										<numIndex index="1">0</numIndex>
-									</numIndex>
-									<numIndex index="1">
-										<numIndex index="0">LLL:EXT:ns_comments/Resources/Private/Language/locallang_db.xlf:flexform.languageFallbackMode.translated</numIndex>
-										<numIndex index="1">1</numIndex>
-									</numIndex>
-								</items>
-								<default>0</default>
-							</config>
-						</TCEforms>
-					</settings.commnetlanguageFallbackMode>
 					<settings.custom>
 						<TCEforms>
 							<label>LLL:EXT:ns_comments/Resources/Private/Language/locallang_db.xlf:flexform.custom</label>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -11,7 +11,7 @@
     'uploadfolder' => '0',
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '2.2.0',
+    'version' => '2.2.1',
     'constraints' => [
         'depends' => [
             'typo3' => '8.0.0-11.5.99',