[BUGFIX] Fix order of generator meta tag 42/37942/5
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 19 Mar 2015 09:19:24 +0000 (10:19 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Thu, 26 Mar 2015 22:18:28 +0000 (23:18 +0100)
Change TYPO3 6.2 CMS to TYPO3 CMS 6.2

Releases: master,6.2
Resolves: #65836
Change-Id: I5486d6fef6a09923ee1c211442675bd2f3b6def0
Reviewed-on: http://review.typo3.org/37942
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
typo3/sysext/frontend/Classes/Page/PageGenerator.php
typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php

index 4e6d4e8..92c774b 100644 (file)
@@ -1180,7 +1180,7 @@ class PageGenerator {
                $endingSlash = $xhtml ? ' /' : '';
 
                $metaTags = array(
-                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS"' . $endingSlash . '>'
+                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '"' . $endingSlash . '>'
                );
 
                /** @var TypoScriptService $typoScriptService */
index 6fffa65..df101ac 100644 (file)
@@ -53,7 +53,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                FALSE,
                                array(
-                                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                        '<meta name="author" content="Markus Klein">',
                                )
                        ),
@@ -63,7 +63,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                TRUE,
                                array(
-                                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS" />',
+                                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '" />',
                                        '<meta name="author" content="Markus Klein" />',
                                )
                        ),
@@ -74,7 +74,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                FALSE,
                                array(
-                                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                        '<meta name="author" content="Markus Klein">',
                                )
                        ),
@@ -85,7 +85,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                FALSE,
                            array(
-                                   '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                   '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                        '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">'
                            )
                        ),
@@ -96,7 +96,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                TRUE,
                                array(
-                                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS" />',
+                                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '" />',
                                        '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />'
                                )
                    ),
@@ -106,7 +106,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ),
                                FALSE,
                                array(
-                                       '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                       '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                        '<meta http-equiv="refresh" content="10">',
                                )
                        ),
@@ -116,7 +116,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                            ),
                            FALSE,
                            array(
-                                   '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                   '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                    '<meta name="DC.author" content="Markus Klein">',
                            )
                    ),
@@ -126,7 +126,7 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                            ),
                            FALSE,
                            array(
-                                   '<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS">',
+                                   '<meta name="generator" content="TYPO3 CMS ' . TYPO3_branch . '">',
                                    '<meta name="OG:title" content="Magic Tests">',
                            )
                    ),