CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 4.4.16 (2018-03-08)
+
+ * Correctly link to the picker from the TinyMCE link menu (see #1415).
+
 ## 4.4.15 (2018-03-06)
 
  * Do not make the response private when saving the session (see #1388).

README.md

@@ -12,7 +12,7 @@ for more information.
 Contao 4 has been designed as a [Symfony][2] bundle, which can be used to add
 CMS functionality to any Symfony application. If you do not have an existing
 Symfony application yet, we recommend using the [Contao managed edition][3] as
-basis for your application.``
+basis for your application.
 
 ## Installation
 

src/Resources/contao/config/constants.php

@@ -10,7 +10,7 @@
 
 // Core version
 \define('VERSION', '4.4');
-\define('BUILD', '15');
+\define('BUILD', '16');
 \define('LONG_TERM_SUPPORT', true);
 
 // Link constants

src/Resources/contao/drivers/DC_Table.php

@@ -3545,9 +3545,12 @@ protected function treeView()
 		}
 
 		// Call a recursive function that builds the tree
-		for ($i=0, $c=\count($this->root); $i<$c; $i++)
+		if (\is_array($this->root))
 		{
-			$tree .= $this->generateTree($table, $this->root[$i], array('p'=>$this->root[($i-1)], 'n'=>$this->root[($i+1)]), $blnHasSorting, -20, ($blnClipboard ? $arrClipboard : false), ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['mode'] == 5 && $blnClipboard && $this->root[$i] == $arrClipboard['id']), false, false, $arrFound);
+			for ($i=0, $c=\count($this->root); $i<$c; $i++)
+			{
+				$tree .= $this->generateTree($table, $this->root[$i], array('p'=>$this->root[($i-1)], 'n'=>$this->root[($i+1)]), $blnHasSorting, -20, ($blnClipboard ? $arrClipboard : false), ($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['mode'] == 5 && $blnClipboard && $this->root[$i] == $arrClipboard['id']), false, false, $arrFound);
+			}
 		}
 
 		// Return if there are no records

src/Resources/public/core.js

@@ -977,7 +977,7 @@ var Backend =
 		Backend.openModalSelector({
 			'id': 'tl_listing',
 			'title': win.document.getElement('div.mce-title').get('text'),
-			'url': document.location.pathname.replace('/contao', '/_contao') + '/picker?context=' + (type == 'file' ? 'link' : 'file') + '&extras[fieldType]=radio&extras[filesOnly]=true&value=' + url + '&popup=1',
+			'url': document.location.pathname + '/picker?context=' + (type == 'file' ? 'link' : 'file') + '&extras[fieldType]=radio&extras[filesOnly]=true&value=' + url + '&popup=1',
 			'callback': function(table, value) {
 				win.document.getElementById(field_name).value = value.join(',');
 			}