From ded3c9f6fc3ea89d785b03c7a95ad46ba4d022e6 Mon Sep 17 00:00:00 2001
From: Tymoteusz Motylewski <t.motylewski@gmail.com>
Date: Fri, 3 Apr 2020 14:38:32 +0200
Subject: [PATCH] [BUGFIX] Do not promote deprecated TS condition syntax in
 changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The old TS Conditions syntax with two blocks combined with && is deprecated
so it should not be used as an example in the changelog.

It was deprecated in:
https://docs.typo3.org/c/typo3/cms-core/master/en-us/Changelog/9.5/Deprecation-86068-OldConditionSyntax.html

Releases: master, 9.5
Resolves: #91017
Change-Id: I60d2fc7c26d8a72f75c82355d4c0d64cf27827c1
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64060
Tested-by: Björn Jacob <bjoern.jacob@tritum.de>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Josef Glatz <josefglatz@gmail.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Björn Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 ...tSymfonyExpressionLanguageForTypoScriptConditions.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst b/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
index fdde5738a3cb..c7c18462e98f 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.4/Feature-85829-ImplementSymfonyExpressionLanguageForTypoScriptConditions.rst
@@ -33,10 +33,11 @@ Here are some examples to understand the power of the expression language:
    # This condition does match if "foo" **not** matches the regExp: `/bar/`
    [END]
 
-   [applicationContext == "Production"] && [userId == 15]
-   # This condition match if application context is "Production" AND logged in user has the uid 15
-   # This condition could also be combined in one condition:
-   # [applicationContext == "Production" && userId == 15]
+   [applicationContext == "Production" && userId == 15]
+   # This condition matches if application context is "Production" AND logged in user has the uid 15
+   # Note that the old syntax with two blocks combined with && is deprecated
+   # and will not work in v10:
+   # [applicationContext == "Production"] && [userId == 15]
    [END]
 
    [request.getNormalizedParams().getHttpHost() == 'typo3.org']
-- 
GitLab