Merge branch 'hotfix/3.5.9'

contao · Mar 21, 2016 · 141fdc2 · 141fdc2
2 parents 26aba3b + 6b19239
commit 141fdc2
Show file tree

Hide file tree

Showing 80 changed files with 342 additions and 193 deletions.
diff --git a/assets/contao/js/core-uncompressed.js b/assets/contao/js/core-uncompressed.js
@@ -527,7 +527,7 @@ var AjaxRequest =
 				} else {
 					pa = img.getParent('a');
 
-					if (pa.href.indexOf('do=feRedirect') == -1) {
+					if (pa && pa.href.indexOf('do=feRedirect') == -1) {
 						if (next = pa.getNext('a')) {
 							img = next.getFirst('img');
 						} else {
@@ -982,7 +982,7 @@ var Backend =
 	 * Open a TinyMCE file browser in a modal window
 	 *
 	 * @param {string} field_name The field name
-	 * @param {object} url        An URI object
+	 * @param {string} url        The URL
 	 * @param {string} type       The picker type
 	 * @param {object} win        The window object
 	 */

diff --git a/assets/contao/js/core.js b/assets/contao/js/core.js
diff --git a/assets/mootools/simplemodal/1.2/css/simplemodal-uncompressed.css b/assets/mootools/simplemodal/1.2/css/simplemodal-uncompressed.css
@@ -67,8 +67,8 @@
   -webkit-border-radius: 6px;
   border-radius: 6px;
 }
+/* PATCH: see #6028 */
 .ios .simple-modal {
-  /* see #6028 */
   overflow: auto;
   bottom: 40px;
   -webkit-overflow-scrolling: touch;
@@ -107,9 +107,11 @@
 .simple-modal .simple-modal-body {
   padding: 0;
 }
+/* PATCH: see #8250
 .simple-modal .simple-modal-body div.contents {
   overflow: hidden;
 }
+*/
 .simple-modal .simple-modal-body p {
   font-size: 13px;
   font-weight: normal;

diff --git a/assets/mootools/simplemodal/1.2/css/simplemodal.css b/assets/mootools/simplemodal/1.2/css/simplemodal.css
diff --git a/assets/mootools/stylect/js/stylect-uncompressed.js b/assets/mootools/stylect/js/stylect-uncompressed.js
@@ -10,7 +10,7 @@
 /**
  * Replace select menus with a nicer, JavaScript based solution.
  *
- * @author Leo Feyer <http://contao.org>
+ * @author Leo Feyer <https://contao.org>
  * @author Joe Ray Gregory <https://github.com/may17>
  */
 var Stylect =

diff --git a/assets/mootools/tablesort/js/tablesort-uncompressed.js b/assets/mootools/tablesort/js/tablesort-uncompressed.js
@@ -31,7 +31,7 @@ var DECIMAL_SEPARATOR = '.';
 /**
  * Provide methods to sort tables keeping the Contao class names intact.
  *
- * @author Leo Feyer <http://contao.org>
+ * @author Leo Feyer <https://contao.org>
  */
 var TableSort = new Class(
 {

diff --git a/system/config/constants.php b/system/config/constants.php
@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '8');
+define('BUILD', '9');
 define('LONG_TERM_SUPPORT', true);
 
 

diff --git a/system/config/default.php b/system/config/default.php
@@ -99,7 +99,7 @@
 	. '<map><mark><menu>'
 	. '<nav>'
 	. '<object><ol><optgroup><option><output>'
-	. '<p><param><pre>'
+	. '<p><param><picture><pre>'
 	. '<q>'
 	. '<s><samp><section><select><small><source><span><strong><style><sub><sup>'
 	. '<table><tbody><td><textarea><tfoot><th><thead><time><tr><tt>'

diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -1,6 +1,52 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.5.9 (2016-03-21)
+--------------------------
+
+### Fixed
+Prevent the autofocus attribute from being added multiple times (see #8281).
+
+### Fixed
+Respect the SSL settings of the root page when generating sitemaps (see #8270).
+
+### Fixed
+Read from the temporary file if it has not been closed yet (see #8269).
+
+### Fixed
+Always use HTTPS if the target server supports SSL connections (see #8183).
+
+### Fixed
+Adjust the meta wizard field length to the column length (see #8277).
+
+### Fixed
+Correctly handle custom mime icon paths (see #8275).
+
+### Fixed
+Only log errors that have been configured to get logged (see #8267).
+
+### Fixed
+Show the 404 error page if an unpublished article is requested (see #8264).
+
+### Fixed
+Correctly count the URLs when rebuilding the search index (see #8262).
+
+### Fixed
+Ensure that every image has a width and height attribute (see #8162).
+
+### Fixed
+Set the correct mime type when embedding SVG images (see #8245).
+
+### Fixed
+Handle the "float_left" and "float_right" classes in the back end (see #8239).
+
+### Fixed
+Consider the fallback language if a page alias is ambiguous (see #8142).
+
+### Fixed
+Fix the error 403/404 redirect (see contao/website#74).
+
+
 Version 3.5.8 (2016-03-01)
 --------------------------
 

diff --git a/system/helper/functions.php b/system/helper/functions.php
@@ -39,8 +39,8 @@ function __error($intType, $strMessage, $strFile, $intLine)
 		E_USER_DEPRECATED   => 'Deprecated notice'
 	);
 
-	// Ignore functions with an error control operator (@function_name)
-	if (ini_get('error_reporting') > 0)
+	// Only log errors that have been configured to get logged (see #8267)
+	if (error_reporting() & $intType)
 	{
 		$e = new Exception();
 

diff --git a/system/modules/calendar/classes/Calendar.php b/system/modules/calendar/classes/Calendar.php
@@ -322,7 +322,7 @@ public function getSearchablePages($arrPages, $intRoot=0, $blnIsSitemap=false)
 				// Get the URL of the jumpTo page
 				if (!isset($arrProcessed[$objCalendar->jumpTo]))
 				{
-					$objParent = \PageModel::findWithDetails($objCalendar->jumpTo);
+					$objParent = \PageModel::findByPk($objCalendar->jumpTo);
 
 					// The target page does not exist
 					if ($objParent === null)
@@ -343,14 +343,7 @@ public function getSearchablePages($arrPages, $intRoot=0, $blnIsSitemap=false)
 					}
 
 					// Generate the URL
-					$feUrl = $objParent->getFrontendUrl((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ?  '/%s' : '/events/%s');
-
-					if (strncmp($feUrl, 'http://', 7) !== 0 && strncmp($feUrl, 'https://', 8) !== 0)
-					{
-						$feUrl = (($objParent->rootUseSSL ? 'https://' : 'http://') . ($objParent->domain ?: \Environment::get('host')) . TL_PATH . '/') . $feUrl;
-					}
-
-					$arrProcessed[$objCalendar->jumpTo] = $feUrl;
+					$arrProcessed[$objCalendar->jumpTo] = $objParent->getAbsoluteUrl((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ?  '/%s' : '/events/%s');
 				}
 
 				$strUrl = $arrProcessed[$objCalendar->jumpTo];

diff --git a/system/modules/calendar/templates/events/event_full.html5 b/system/modules/calendar/templates/events/event_full.html5
@@ -23,7 +23,7 @@
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon"> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
+        <p><?= Image::getHtml($enclosure['icon'], '', 'class="mime_icon"') ?> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>

diff --git a/system/modules/calendar/templates/events/event_full.xhtml b/system/modules/calendar/templates/events/event_full.xhtml
@@ -23,7 +23,7 @@
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon" /> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
+        <p><?= Image::getHtml($enclosure['icon'], '', 'class="mime_icon"') ?> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>

diff --git a/system/modules/core/classes/Backend.php b/system/modules/core/classes/Backend.php
@@ -677,12 +677,6 @@ public static function findSearchablePages($pid=0, $domain='', $blnIsSitemap=fal
 			return array();
 		}
 
-		// Fallback domain
-		if ($domain == '')
-		{
-			$domain = \Environment::get('base');
-		}
-
 		$arrPages = array();
 		$objRegistry = \Model\Registry::getInstance();
 
@@ -704,27 +698,15 @@ public static function findSearchablePages($pid=0, $domain='', $blnIsSitemap=fal
 					// Published
 					if ($objPage->published && ($objPage->start == '' || $objPage->start <= $time) && ($objPage->stop == '' || $objPage->stop > ($time + 60)))
 					{
-						$feUrl = $objPage->getFrontendUrl();
-
-						if (strncmp($feUrl, 'http://', 7) !== 0 && strncmp($feUrl, 'https://', 8) !== 0)
-						{
-							$feUrl = $domain . $feUrl;
-						}
-
-						$arrPages[] = $feUrl;
+						$arrPages[] = $objPage->getAbsoluteUrl();
 
 						// Get articles with teaser
 						$objArticles = $objDatabase->prepare("SELECT * FROM tl_article WHERE pid=? AND (start='' OR start<='$time') AND (stop='' OR stop>'" . ($time + 60) . "') AND published='1' AND showTeaser='1' ORDER BY sorting")
 												   ->execute($objPages->id);
 
 						if ($objArticles->numRows)
 						{
-							$feUrl = $objPage->getFrontendUrl('/articles/%s');
-
-							if (strncmp($feUrl, 'http://', 7) !== 0 && strncmp($feUrl, 'https://', 8) !== 0)
-							{
-								$feUrl = $domain . $feUrl;
-							}
+							$feUrl = $objPage->getAbsoluteUrl('/articles/%s');
 
 							while ($objArticles->next())
 							{
@@ -948,7 +930,7 @@ public static function addPagesBreadcrumb($strKey='tl_page_node')
 		$GLOBALS['TL_DCA']['tl_page']['list']['sorting']['root'] = array($intNode);
 
 		// Add root link
-		$arrLinks[] = '<img src="' . TL_FILES_URL . 'system/themes/' . \Backend::getTheme() . '/images/pagemounts.gif" width="18" height="18" alt=""> <a href="' . \Controller::addToUrl('node=0') . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectAllNodes']).'">' . $GLOBALS['TL_LANG']['MSC']['filterAll'] . '</a>';
+		$arrLinks[] = \Image::getHtml('pagemounts.gif') . ' <a href="' . \Controller::addToUrl('node=0') . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectAllNodes']).'">' . $GLOBALS['TL_LANG']['MSC']['filterAll'] . '</a>';
 		$arrLinks = array_reverse($arrLinks);
 
 		// Insert breadcrumb menu
@@ -1053,7 +1035,7 @@ public static function addFilesBreadcrumb($strKey='tl_files_node')
 		$arrLinks = array();
 
 		// Add root link
-		$arrLinks[] = '<img src="' . TL_FILES_URL . 'system/themes/' . \Backend::getTheme() . '/images/filemounts.gif" width="18" height="18" alt=""> <a href="' . \Controller::addToUrl('node=') . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectAllNodes']).'">' . $GLOBALS['TL_LANG']['MSC']['filterAll'] . '</a>';
+		$arrLinks[] = \Image::getHtml('filemounts.gif') . ' <a href="' . \Controller::addToUrl('node=') . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectAllNodes']).'">' . $GLOBALS['TL_LANG']['MSC']['filterAll'] . '</a>';
 
 		// Generate breadcrumb trail
 		foreach ($arrNodes as $strFolder)
@@ -1069,11 +1051,11 @@ public static function addFilesBreadcrumb($strKey='tl_files_node')
 			// No link for the active folder
 			if ($strPath == $strNode)
 			{
-				$arrLinks[] = '<img src="' . TL_FILES_URL . 'system/themes/' . \Backend::getTheme() . '/images/folderC.gif" width="18" height="18" alt=""> ' . $strFolder;
+				$arrLinks[] = \Image::getHtml('folderC.gif') . ' ' . $strFolder;
 			}
 			else
 			{
-				$arrLinks[] = '<img src="' . TL_FILES_URL . 'system/themes/' . \Backend::getTheme() . '/images/folderC.gif" width="18" height="18" alt=""> <a href="' . \Controller::addToUrl('node='.$strPath) . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectNode']).'">' . $strFolder . '</a>';
+				$arrLinks[] = \Image::getHtml('folderC.gif') . ' <a href="' . \Controller::addToUrl('node='.$strPath) . '" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['selectNode']).'">' . $strFolder . '</a>';
 			}
 		}
 

diff --git a/system/modules/core/classes/DataContainer.php b/system/modules/core/classes/DataContainer.php
@@ -382,7 +382,7 @@ protected function row($strPalette=null)
 					break;
 			}
 
-			$wizard .= ' <img src="assets/mootools/datepicker/' . $GLOBALS['TL_ASSETS']['DATEPICKER'] . '/icon.gif" width="20" height="20" alt="" title="'.specialchars($GLOBALS['TL_LANG']['MSC']['datepicker']).'" id="toggle_' . $objWidget->id . '" style="vertical-align:-6px;cursor:pointer">
+			$wizard .= ' ' . \Image::getHtml('assets/mootools/datepicker/' . $GLOBALS['TL_ASSETS']['DATEPICKER'] . '/icon.gif', '', 'title="'.specialchars($GLOBALS['TL_LANG']['MSC']['datepicker']).'" id="toggle_' . $objWidget->id . '" style="vertical-align:-6px;cursor:pointer"') . '
   <script>
     window.addEvent("domready", function() {
       new Picker.Date($("ctrl_' . $objWidget->id . '"), {