From 93bc7b4efe096f433a1565ad0f3b11c0f3f1955c Mon Sep 17 00:00:00 2001
From: Manuel Selbach <manuel_selbach@yahoo.de>
Date: Fri, 7 Aug 2015 09:55:26 +0200
Subject: [PATCH] [!!!][TASK] Remove of base constant TYPO3_URL_ORG
Base constant TYPO3_URL_ORG defined in
SystemEnvironmentBuilder::defineBaseConstants() was removed.
Was for internal usage only and defined at 2 places in the core.
Resolves: #68814
Releases: master
Change-Id: I16e94f572ee6c1e84ff0f358c3092d7fe6ad93cd
Reviewed-on: http://review.typo3.org/42345
Reviewed-by: Daniel Maier <dani-maier@gmx.de>
Tested-by: Daniel Maier <dani-maier@gmx.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Classes/Core/SystemEnvironmentBuilder.php | 1 -
...8814-RemoveOfBaseConstantTYPO3_URL_ORG.rst | 21 +++++++++++++++++++
.../frontend/Classes/Page/PageGenerator.php | 2 +-
.../Partials/Action/Common/Copyright.html | 2 +-
4 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-68814-RemoveOfBaseConstantTYPO3_URL_ORG.rst
diff --git a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
index 200e26cf342a..f9ea553c622c 100644
--- a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
+++ b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
@@ -90,7 +90,6 @@ class SystemEnvironmentBuilder {
// TYPO3 external links
define('TYPO3_URL_GENERAL', 'http://typo3.org/');
- define('TYPO3_URL_ORG', 'http://typo3.org/');
define('TYPO3_URL_LICENSE', 'http://typo3.org/typo3-cms/overview/licenses/');
define('TYPO3_URL_EXCEPTION', 'http://typo3.org/go/exception/CMS/');
define('TYPO3_URL_MAILINGLISTS', 'http://lists.typo3.org/cgi-bin/mailman/listinfo');
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-68814-RemoveOfBaseConstantTYPO3_URL_ORG.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-68814-RemoveOfBaseConstantTYPO3_URL_ORG.rst
new file mode 100644
index 000000000000..c882bcad8293
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-68814-RemoveOfBaseConstantTYPO3_URL_ORG.rst
@@ -0,0 +1,21 @@
+========================================================
+Breaking: #68814 - Remove of base constant TYPO3_URL_ORG
+========================================================
+
+Description
+===========
+
+Base constant TYPO3_URL_ORG defined in SystemEnvironmentBuilder::defineBaseConstants() can be removed.
+It´s for internal usage only and defined at 2 places in the core.
+
+
+Impact
+======
+
+Constant TYPO3_URL_ORG no longer exists.
+
+
+Migration
+=========
+
+Use TYPO3_URL_GENERAL instead.
\ No newline at end of file
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index ced0a61c4f59..e1e377b91dc3 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -386,7 +386,7 @@ class PageGenerator {
$pageRenderer->addInlineComment(' This website is powered by TYPO3 - inspiring people to share!
TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
TYPO3 is copyright ' . TYPO3_copyright_year . ' of Kasper Skaarhoj. Extensions are copyright of their respective owners.
- Information and contribution at ' . TYPO3_URL_ORG . '
+ Information and contribution at ' . TYPO3_URL_GENERAL . '
');
if ($tsfe->baseUrl) {
$pageRenderer->setBaseUrl($tsfe->baseUrl);
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Copyright.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Copyright.html
index 3aaeceb12d4a..c0e832e1ecf9 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Copyright.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Copyright.html
@@ -12,6 +12,6 @@
</p>
<p>
<a href="{i:constant(name: 'TYPO3_URL_DONATE')}"><strong>Donate</strong></a> |
- <a href="{i:constant(name: 'TYPO3_URL_ORG')}">TYPO3.org</a>
+ <a href="{i:constant(name: 'TYPO3_URL_GENERAL')}">TYPO3.org</a>
</p>
</div>
\ No newline at end of file
--
GitLab