[BUGFIX] Fix order of generator meta tag 82/38282/2
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:19:04 +0000 (23:19 +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/38282
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 210a14f..559e532 100644 (file)
@@ -1117,7 +1117,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 */
@@ -1161,4 +1161,4 @@ class PageGenerator {
                        $GLOBALS['TSFE']->sWordRegEx = rtrim($GLOBALS['TSFE']->sWordRegEx, '|');
                }
        }
-}
\ No newline at end of file
+}
index 4b02e71..b604b6c 100644 (file)
@@ -52,7 +52,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">',
                                )
                        ),
@@ -62,7 +62,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" />',
                                )
                        ),
@@ -73,7 +73,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">',
                                )
                        ),
@@ -84,7 +84,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">'
                            )
                        ),
@@ -95,7 +95,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" />'
                                )
                    ),
@@ -105,7 +105,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">',
                                )
                        ),
@@ -115,7 +115,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">',
                            )
                    ),
@@ -125,7 +125,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">',
                            )
                    ),
@@ -198,4 +198,4 @@ class PageGeneratorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->pageGeneratorFixture->callInitializeSearchWordDataInTsfe();
                $this->assertEquals($GLOBALS['TSFE']->sWordRegEx, $expectedRegex);
        }
-}
\ No newline at end of file
+}