assets/contao/js/core-uncompressed.js

@@ -1388,7 +1388,7 @@ var Backend =
 			}
 			$(oid).value = els.join(',');
 		});
-		list.fireEvent("complete"); // Initial sorting
+		list.fireEvent('complete'); // Initial sorting
 	},
 
 	/**

assets/mootools/mootao/Mootao-uncompressed.js

@@ -109,10 +109,10 @@ Tips.Contao = new Class(
 
 	options: {
 		id: 'tip',
-		onShow: function(){
+		onShow: function() {
 			this.tip.setStyle('display', 'block');
 		},
-		onHide: function(){
+		onHide: function() {
 			this.tip.setStyle('display', 'none');
 		},
 		title: 'title',

system/config/constants.php

@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '5');
+define('BUILD', '6');
 define('LONG_TERM_SUPPORT', true);
 
 

system/config/tinyFlash.php

@@ -19,29 +19,32 @@
 <script>window.tinymce || document.write('<script src="<?php echo TL_ASSETS_URL; ?>assets/tinymce4/tinymce.gzip.js">\x3C/script>')</script>
 <script>
 window.tinymce && tinymce.init({
-  skin: "contao",
-  selector: "#<?php echo $selector; ?>",
-  language: "<?php echo Backend::getTinyMceLanguage(); ?>",
-  element_format: "html",
+  skin: 'contao',
+  selector: '#<?php echo $selector; ?>',
+  language: '<?php echo Backend::getTinyMceLanguage(); ?>',
+  element_format: 'html',
   forced_root_block: false,
-  document_base_url: "<?php echo Environment::get('base'); ?>",
-  entities: "160,nbsp,60,lt,62,gt,173,shy",
+  document_base_url: '<?php echo Environment::get('base'); ?>',
+  entities: '160,nbsp,60,lt,62,gt,173,shy',
+  setup: function(editor) {
+    editor.getElement().removeAttribute('required');
+  },
   init_instance_callback: function(editor) {
-    editor.on('focus', function(){ Backend.getScrollOffset(); });
+    editor.on('focus', function() { Backend.getScrollOffset(); });
   },
   file_browser_callback: function(field_name, url, type, win) {
     Backend.openModalBrowser(field_name, url, type, win);
   },
   templates: [
     <?php echo Backend::getTinyTemplates(); ?>
   ],
-  plugins: "autosave charmap code fullscreen image legacyoutput link lists paste searchreplace tabfocus template visualblocks",
+  plugins: 'autosave charmap code fullscreen image legacyoutput link lists paste searchreplace tabfocus template visualblocks',
   browser_spellcheck: true,
-  tabfocus_elements: ":prev,:next",
-  content_css: "<?php echo TL_PATH; ?>/system/themes/tinymce.css",
-  extended_valid_elements: "b/strong,i/em",
-  menubar: "file edit insert view format table",
-  toolbar: "link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code"
+  tabfocus_elements: ':prev,:next',
+  content_css: '<?php echo TL_PATH; ?>/system/themes/tinymce.css',
+  extended_valid_elements: 'b/strong,i/em',
+  menubar: 'file edit insert view format table',
+  toolbar: 'link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code'
 });
 </script>
 <?php endif; ?>

system/config/tinyMCE.php

@@ -19,30 +19,33 @@
 <script>window.tinymce || document.write('<script src="<?php echo TL_ASSETS_URL; ?>assets/tinymce4/tinymce.gzip.js">\x3C/script>')</script>
 <script>
 window.tinymce && tinymce.init({
-  skin: "contao",
-  selector: "#<?php echo $selector; ?>",
-  language: "<?php echo Backend::getTinyMceLanguage(); ?>",
-  element_format: "html",
-  document_base_url: "<?php echo Environment::get('base'); ?>",
-  entities: "160,nbsp,60,lt,62,gt,173,shy",
+  skin: 'contao',
+  selector: '#<?php echo $selector; ?>',
+  language: '<?php echo Backend::getTinyMceLanguage(); ?>',
+  element_format: 'html',
+  document_base_url: '<?php echo Environment::get('base'); ?>',
+  entities: '160,nbsp,60,lt,62,gt,173,shy',
+  setup: function(editor) {
+    editor.getElement().removeAttribute('required');
+  },
   init_instance_callback: function(editor) {
-    editor.on('focus', function(){ Backend.getScrollOffset(); });
+    editor.on('focus', function() { Backend.getScrollOffset(); });
   },
   file_browser_callback: function(field_name, url, type, win) {
     Backend.openModalBrowser(field_name, url, type, win);
   },
   templates: [
     <?php echo Backend::getTinyTemplates(); ?>
   ],
-  plugins: "autosave charmap code fullscreen image importcss link lists paste searchreplace tabfocus table template visualblocks",
+  plugins: 'autosave charmap code fullscreen image importcss link lists paste searchreplace tabfocus table template visualblocks',
   browser_spellcheck: true,
-  tabfocus_elements: ":prev,:next",
+  tabfocus_elements: ':prev,:next',
   importcss_append: true,
-  importcss_groups: [{title: "<?php echo Config::get('uploadPath'); ?>/tinymce.css"}],
-  content_css: "<?php echo TL_PATH; ?>/system/themes/tinymce.css,<?php echo TL_PATH . '/' . Config::get('uploadPath'); ?>/tinymce.css",
-  extended_valid_elements: "q[cite|class|title],article,section,hgroup,figure,figcaption",
-  menubar: "file edit insert view format table",
-  toolbar: "link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code"
+  importcss_groups: [{title: '<?php echo Config::get('uploadPath'); ?>/tinymce.css'}],
+  content_css: '<?php echo TL_PATH; ?>/system/themes/tinymce.css,<?php echo TL_PATH . '/' . Config::get('uploadPath'); ?>/tinymce.css',
+  extended_valid_elements: 'q[cite|class|title],article,section,hgroup,figure,figcaption',
+  menubar: 'file edit insert view format table',
+  toolbar: 'link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code'
 });
 </script>
 <?php endif; ?>

system/config/tinyNews.php

@@ -19,29 +19,32 @@
 <script>window.tinymce || document.write('<script src="<?php echo TL_ASSETS_URL; ?>assets/tinymce4/tinymce.gzip.js">\x3C/script>')</script>
 <script>
 window.tinymce && tinymce.init({
-  skin: "contao",
-  selector: "#<?php echo $selector; ?>",
-  language: "<?php echo Backend::getTinyMceLanguage(); ?>",
-  element_format: "html",
-  document_base_url: "<?php echo Environment::get('base'); ?>",
-  entities: "160,nbsp,60,lt,62,gt,173,shy",
+  skin: 'contao',
+  selector: '#<?php echo $selector; ?>',
+  language: '<?php echo Backend::getTinyMceLanguage(); ?>',
+  element_format: 'html',
+  document_base_url: '<?php echo Environment::get('base'); ?>',
+  entities: '160,nbsp,60,lt,62,gt,173,shy',
+  setup: function(editor) {
+    editor.getElement().removeAttribute('required');
+  },
   init_instance_callback: function(editor) {
-    editor.on('focus', function(){ Backend.getScrollOffset(); });
+    editor.on('focus', function() { Backend.getScrollOffset(); });
   },
   file_browser_callback: function(field_name, url, type, win) {
     Backend.openModalBrowser(field_name, url, type, win);
   },
   templates: [
     <?php echo Backend::getTinyTemplates(); ?>
   ],
-  doctype: "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 3.2//EN\">",
-  plugins: "autosave charmap code fullscreen image link lists paste searchreplace tabfocus table template visualblocks",
+  doctype: '<!DOCTYPE html PUBLIC \'-//W3C//DTD HTML 3.2//EN\'>',
+  plugins: 'autosave charmap code fullscreen image link lists paste searchreplace tabfocus table template visualblocks',
   browser_spellcheck: true,
-  tabfocus_elements: ":prev,:next",
-  content_css: "<?php echo TL_PATH; ?>/system/themes/tinymce.css",
-  extended_valid_elements: "b/strong,i/em",
-  menubar: "file edit insert view format table",
-  toolbar: "link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code"
+  tabfocus_elements: ':prev,:next',
+  content_css: '<?php echo TL_PATH; ?>/system/themes/tinymce.css',
+  extended_valid_elements: 'b/strong,i/em',
+  menubar: 'file edit insert view format table',
+  toolbar: 'link unlink | image | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | undo redo | code'
 });
 </script>
 <?php endif; ?>

system/docs/CHANGELOG.md

@@ -1,6 +1,22 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.5.6 (2015-11-27)
+--------------------------
+
+### Fixed
+Correctly determin the protocol delimiter in `Idna::encodeUrl()`.
+
+### Fixed
+Handle relative URLs when following redirects in the Request class (see #7799).
+
+### Fixed
+Correctly handle empty UUIDs when comparing versions (see #7971).
+
+### Fixed
+Remove the "required" attribute when setting up TinyMCE (see #8131).
+
+
 Version 3.5.5 (2015-11-25)
 --------------------------
 

system/modules/core/classes/Versions.php

@@ -693,7 +693,12 @@ protected function implodeRecursive($var, $binary=false)
 		}
 		elseif (!is_array(current($var)))
 		{
-			return implode(', ', ($binary ? array_map('StringUtil::binToUuid', $var) : $var));
+			if ($binary)
+			{
+				$var = array_map(function ($v) { return $v ? \StringUtil::binToUuid($v) : ''; }, $var);
+			}
+
+			return implode(', ', $var);
 		}
 		else
 		{

system/modules/core/languages/en/tl_form_field.xlf

@@ -138,7 +138,7 @@
         <source>Numeric characters</source>
       </trans-unit>
       <trans-unit id="tl_form_field.digit.1">
-        <source>Allows numeric characters, minus (-), full stop (.) and space ( ).</source>
+        <source>Allows numeric characters, minus (-) and full stop (.).</source>
       </trans-unit>
       <trans-unit id="tl_form_field.alpha.0">
         <source>Alphabetic characters</source>

system/modules/core/library/Contao/Idna.php

@@ -124,14 +124,7 @@ public static function encodeUrl($strUrl)
 		// Scheme
 		if (isset($arrUrl['scheme']))
 		{
-			if ($arrUrl['scheme'] == 'tel' || $arrUrl['scheme'] == 'sms')
-			{
-				$arrUrl['scheme'] .= ':'; // see #6148
-			}
-			else
-			{
-				$arrUrl['scheme'] .= '://';
-			}
+			$arrUrl['scheme'] .= ((substr($strUrl, strlen($arrUrl['scheme']), 3) == '://') ? '://' : ':');
 		}
 
 		// User

system/modules/core/library/Contao/Request.php

@@ -430,7 +430,15 @@ public function send($strUrl, $strData=null, $strMethod=null)
 				if ($this->blnFollowRedirects && $this->intRedirects < $this->intRedirectLimit && !empty($this->arrResponseHeaders['Location']))
 				{
 					++$this->intRedirects;
-					$this->send($this->arrResponseHeaders['Location']);
+					$strLocation = $this->arrResponseHeaders['Location'];
+
+					// Make sure the location is an absolute URL (see #7799)
+					if (!preg_match('@^https?://@', $strLocation))
+					{
+						$strLocation = $uri['scheme'] . '://' . $host . $strLocation;
+					}
+
+					$this->send($strLocation);
 				}
 				break;
 

system/modules/repository/classes/RepositorySettings.php

@@ -17,6 +17,8 @@
 
 // valid core versions in descending order
 define('REPOSITORY_COREVERSIONS',
+		'30050069,30050069;'.	// 3.5.6
+		'30050059,30050059;'.	// 3.5.5
 		'30050049,30050049;'.	// 3.5.4
 		'30050039,30050039;'.	// 3.5.3
 		'30050029,30050029;'.	// 3.5.2