CHANGELOG.md

@@ -1,5 +1,15 @@
 # Contao core bundle change log
 
+### 4.2.1 (2016-07-15)
+
+ * Strip soft hyphens when indexing a page (see contao/core#8389).
+ * Do not run the command scheduler if the installation is incomplete (see #541).
+ * Do not index randomly ordered image galleries.
+ * Fix the filter menu layout on mobile devices.
+ * Provide the back end fonts in different variants (see #523).
+ * Fix the message markup in the member templates.
+ * Correctly load the language strings in the pretty error screen listener.
+
 ### 4.2.0 (2016-06-18)
 
  * Also check for the back end cookie when loading from cache (see contao/core#8249).

composer.json

@@ -36,7 +36,7 @@
         "simplepie/simplepie": "~1.3",
         "tecnickcom/tcpdf": "~6.0",
         "true/punycode": "~1.0",
-        "contao-components/all": "~5.0"
+        "contao-components/all": "^5.0.2"
     },
     "require-dev": {
         "composer/composer": "~1.0",
@@ -58,16 +58,15 @@
             "Contao\\CoreBundle\\": "src/"
         },
         "classmap": [
-            "src/Resources/contao/classes",
-            "src/Resources/contao/controllers",
-            "src/Resources/contao/drivers",
-            "src/Resources/contao/elements",
-            "src/Resources/contao/forms",
-            "src/Resources/contao/library",
-            "src/Resources/contao/models",
-            "src/Resources/contao/modules",
-            "src/Resources/contao/pages",
-            "src/Resources/contao/widgets"
+            "src/Resources/contao"
+        ],
+        "exclude-from-classmap": [
+            "src/Resources/contao/config",
+            "src/Resources/contao/dca",
+            "src/Resources/contao/helper",
+            "src/Resources/contao/languages",
+            "src/Resources/contao/templates",
+            "src/Resources/contao/themes"
         ]
     },
     "autoload-dev": {

src/Cache/ContaoCacheWarmer.php

@@ -145,14 +145,14 @@ private function generateCacheMapper($cacheDir)
             return;
         }
 
-        while ($pages->next()) {
-            $base = ($pages->dns ?: '*');
+        foreach ($pages as $page) {
+            $base = ($page->dns ?: '*');
 
-            if ($pages->fallback) {
-                $mapper[$base.'/empty.fallback'] = $base.'/empty.'.$pages->language;
+            if ($page->fallback) {
+                $mapper[$base.'/empty.fallback'] = $base.'/empty.'.$page->language;
             }
 
-            $mapper[$base.'/empty.'.$pages->language] = $base.'/empty.'.$pages->language;
+            $mapper[$base.'/empty.'.$page->language] = $base.'/empty.'.$page->language;
         }
 
         $this->filesystem->dumpFile(

src/EventListener/CommandSchedulerListener.php

@@ -48,7 +48,7 @@ public function onKernelTerminate()
         /** @var Config $config */
         $config = $this->framework->getAdapter('Contao\Config');
 
-        if ($config->get('disableCron')) {
+        if (!$config->isComplete() || $config->get('disableCron')) {
             return;
         }
 

src/EventListener/MergeHttpHeadersListener.php

@@ -92,8 +92,10 @@ private function mergeHttpHeaders(Response $response)
                 header_remove($name);
             }
 
-            // Do not replace existing headers as the response object has a higher priority
-            $response->headers->set($name, trim($content), false);
+            // Do not replace existing response headers
+            if (!$response->headers->has($name)) {
+                $response->headers->set($name, trim($content));
+            }
         }
 
         return $response;

src/EventListener/PrettyErrorScreenListener.php

@@ -342,9 +342,7 @@ private function getTemplateParameters($view, $statusCode, GetResponseForExcepti
      */
     private function loadLanguageStrings()
     {
-        if (!class_exists('Contao\System')) {
-            return null;
-        }
+        $this->framework->initialize();
 
         System::loadLanguageFile('exception');
 

src/Resources/config/services.yml

@@ -57,6 +57,9 @@ services:
     contao.monolog.handler:
         class: Contao\CoreBundle\Monolog\ContaoTableHandler
         public: false
+        arguments:
+            - debug
+            - false
         calls:
             - ["setContainer", ["@service_container"]]
         tags:

src/Resources/contao/config/constants.php

@@ -10,7 +10,7 @@
 
 // Core version
 define('VERSION', '4.2');
-define('BUILD', '0');
+define('BUILD', '1');
 define('LONG_TERM_SUPPORT', false);
 
 // Link constants

src/Resources/contao/controllers/FrontendIndex.php

@@ -135,9 +135,6 @@ public function run()
 		// Throw a 404 error if the page could not be found
 		if ($objPage === null)
 		{
-			$this->User->authenticate();
-			$this->log('No active page for page ID "' . $pageId . '" (' . \Environment::get('base') . \Environment::get('request') . ')', __METHOD__, TL_ERROR);
-
 			throw new PageNotFoundException('Page not found: ' . \Environment::get('uri'));
 		}
 
@@ -207,9 +204,6 @@ public function run()
 		// Check wether the language matches the root page language
 		if (\Config::get('addLanguageToUrl') && \Input::get('language') != $objPage->rootLanguage)
 		{
-			$this->User->authenticate();
-			$this->log('No active page for page ID "' . $pageId . '" and language "' . \Input::get('language') . '" (' . \Environment::get('base') . \Environment::get('request') . ')', __METHOD__, TL_ERROR);
-
 			throw new PageNotFoundException('Page not found: ' . \Environment::get('uri'));
 		}
 
@@ -229,7 +223,6 @@ public function run()
 		// Authenticate the user
 		if (!$this->User->authenticate() && $objPage->protected && !BE_USER_LOGGED_IN)
 		{
-			$this->log('Access to page ID "' . $pageId . '" denied (' . \Environment::get('base') . \Environment::get('request') . ')', __METHOD__, TL_ERROR);
 			throw new AccessDeniedException('Access denied: ' . \Environment::get('uri'));
 		}
 

src/Resources/contao/dca/tl_page.php

@@ -256,7 +256,7 @@
 			'exclude'                 => true,
 			'search'                  => true,
 			'inputType'               => 'text',
-			'eval'                    => array('mandatory'=>true, 'rgxp'=>'language', 'maxlength'=>5, 'nospace'=>true, 'doNotCopy'=>true, 'tl_class'=>'w50 clr'),
+			'eval'                    => array('mandatory'=>true, 'rgxp'=>'language', 'maxlength'=>5, 'nospace'=>true, 'doNotCopy'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(5) NOT NULL default ''"
 		),
 		'robots' => array

src/Resources/contao/dca/tl_templates.php

@@ -403,6 +403,21 @@ public function compareTemplate(DataContainer $dc)
 				$strBuffer .= '<p class="tl_info" style="margin-bottom:1em">' . sprintf($GLOBALS['TL_LANG']['tl_templates']['overridesAnotherTpl'], $strComparePath) . '</p>';
 			}
 		}
+		else
+		{
+			// Try to find the base template by strippig suffixes
+			while (strpos($strName, '_') !== false)
+			{
+				$strName = substr($strName, 0, strrpos($strName, '_'));
+
+				if (isset($arrTemplates[$strName]))
+				{
+					$strCompareName = $strName;
+					$strComparePath = $arrTemplates[$strCompareName] . '/' .$strCompareName . '.' . $strExtension;
+					break;
+				}
+			}
+		}
 
 		// User selected template to compare against
 		if (Input::post('from') && isset($arrTemplates[Input::post('from')]))

src/Resources/contao/elements/ContentGallery.php

@@ -262,6 +262,7 @@ protected function compile()
 
 			case 'random':
 				shuffle($images);
+				$this->Template->isRandomOrder = true;
 				break;
 		}
 

src/Resources/contao/languages/cs/default.xlf

@@ -1311,8 +1311,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <target>Jdi na frontend</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
-        <target>Zobrazení frontendu</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1730,8 +1729,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <target>Vraťte se prosím do výběru stránek nebo souborů a proveďte výběr, než zavřete toto dialogové okno. </target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>Zprávy systému</target>
+        <source>Notifications</source>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/cs/tl_member.xlf

@@ -286,8 +286,7 @@
         <target>Aktivovat / deaktivovat člena ID %s</target>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
-        <target>Zobrazení frontendu</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/de/default.xlf

@@ -1324,8 +1324,8 @@ Diese E-Mail wurde von Contao generiert. Sie können nicht darauf antworten.
         <target>Zum Frontend</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
-        <target>Frontend-Vorschau</target>
+        <source>Preview</source>
+        <target>Vorschau</target>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1744,8 +1744,8 @@ Diese E-Mail wurde von Contao generiert. Sie können nicht darauf antworten.
         <target>Bitte gehen Sie zurück zum Seiten- bzw. Dateiwähler und nehmen Sie dort eine Auswahl vor, bevor Sie den Dialog schließen.</target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>Systemnachrichten</target>
+        <source>Notifications</source>
+        <target>Mitteilungen</target>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/de/tl_member.xlf

@@ -286,8 +286,8 @@
         <target>Mitglied ID %s aktivieren/deaktivieren</target>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
-        <target>Frontend-Vorschau</target>
+        <source>Preview</source>
+        <target>Vorschau</target>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/en/default.xlf

@@ -990,7 +990,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <source>Go to front end</source>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1305,7 +1305,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <source>Please go back to the page or file picker and make a selection before you close the dialog.</source>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
+        <source>Notifications</source>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/en/tl_member.xlf

@@ -216,7 +216,7 @@
         <source>Activate/deactivate member ID %s</source>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/es/default.xlf

@@ -1324,8 +1324,7 @@ Este e-mail ha sido generado por Contao. No puedes contestar directamente.
         <target>Ir al front end</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
-        <target>Front end vista preliminar</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1744,8 +1743,7 @@ Este e-mail ha sido generado por Contao. No puedes contestar directamente.
         <target>Por favor regrese al selector de páginas o fichero y haga una selección antes de cerrar el diálogo.</target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>Mensajes del sistema</target>
+        <source>Notifications</source>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/es/tl_member.xlf

@@ -286,8 +286,7 @@
         <target>Activar/desactivar el miembro con ID %s</target>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
-        <target>Front end vista preliminar</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/fa/default.xlf

@@ -1318,8 +1318,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <target>رفتن به بخش کاربری</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
-        <target>پیش‌نمایش بخش کاربری</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1736,8 +1735,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
         <target>لطفا به انتخابگر پرونده یا برگه باز گردید قبل از این دیالوگ را ببندید.</target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>پیغام‌های سامانه</target>
+        <source>Notifications</source>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/fa/tl_member.xlf

@@ -286,8 +286,7 @@
         <target>فعال/غیرفعال کردن عضو شناسه‌ی %s</target>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
-        <target>پیش‌نمایش بخش کاربری</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/fi/default.xlf

@@ -1311,8 +1311,7 @@ Tämä viesti on Contaon generoima, eikä siihen voi vastata.
         <target>Siirry sivustolle</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
-        <target>Sivuston esikatselu</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
         <source>Preview of the website in a new window</source>
@@ -1726,8 +1725,7 @@ Tämä viesti on Contaon generoima, eikä siihen voi vastata.
         <target>Ole hyvä ja palaa takaisin sivu- tai tiedostonvalitsimeen ja tee valinnat ennenkuin suljet dialogin.</target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>Järjestelmän viestit</target>
+        <source>Notifications</source>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>

src/Resources/contao/languages/fi/tl_member.xlf

@@ -286,8 +286,7 @@
         <target>Ota käyttöön / poista käytöstä jäsenen ID %s tili </target>
       </trans-unit>
       <trans-unit id="tl_member.su.0">
-        <source>Front end preview</source>
-        <target>Sivuston esikatselu</target>
+        <source>Preview</source>
       </trans-unit>
       <trans-unit id="tl_member.su.1">
         <source>Preview the front end as member ID %s</source>

src/Resources/contao/languages/fr/default.xlf

@@ -225,6 +225,7 @@
       </trans-unit>
       <trans-unit id="ERR.topLevelRegular">
         <source>There are top-level pages in the site structure which are not website root pages.</source>
+        <target>Il y a des pages de niveau supérieur dans la structure du site qui ne sont pas des pages racines du site.</target>
       </trans-unit>
       <trans-unit id="ERR.invalidTokenUrl">
         <source>The link you were trying to open could not be verified. If you have clicked the link yourself or have received it by a trustworthy person, you can confirm the process below.</source>
@@ -1321,7 +1322,7 @@ Cet e-mail a été généré par Contao. Merci de ne pas y répondre directement
         <target>Aller sur le front office</target>
       </trans-unit>
       <trans-unit id="MSC.fePreview">
-        <source>Front end preview</source>
+        <source>Preview</source>
         <target>Aperçu</target>
       </trans-unit>
       <trans-unit id="MSC.fePreviewTitle">
@@ -1741,8 +1742,8 @@ Cet e-mail a été généré par Contao. Merci de ne pas y répondre directement
         <target>Veuillez revenir au sélecteur de pages ou de fichiers et faire une sélection avant de fermer la boîte de dialogue.</target>
       </trans-unit>
       <trans-unit id="MSC.systemMessages">
-        <source>System messages</source>
-        <target>Messages du système</target>
+        <source>Notifications</source>
+        <target>Notifications</target>
       </trans-unit>
       <trans-unit id="MSC.clearClipboard">
         <source>Clear clipboard</source>