Restore basic entities before auto-generating an alias (see #3767)

contao · Jan 6, 2012 · 21de1c2 · 21de1c2
1 parent a14d0a5
commit 21de1c2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 2.11.0 (XXXX-XX-XX)
 ---------------------------
 
+### Fixed
+Restore basic entities before auto-generating an alias (see #3767).
+
 ### Improved
 Remove a page from the search index if it does not exist anymore (see #3761).
 

diff --git a/system/modules/backend/dca/tl_article.php b/system/modules/backend/dca/tl_article.php
@@ -510,7 +510,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if ($varValue == '')
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->title);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->title));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_article WHERE id=? OR alias=?")

diff --git a/system/modules/backend/dca/tl_form.php b/system/modules/backend/dca/tl_form.php
@@ -420,7 +420,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if ($varValue == '')
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->title);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->title));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_form WHERE id=? OR alias=?")

diff --git a/system/modules/backend/dca/tl_page.php b/system/modules/backend/dca/tl_page.php
@@ -956,7 +956,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if ($varValue == '')
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->title);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->title));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_page WHERE id=? OR alias=?")

diff --git a/system/modules/calendar/dca/tl_calendar_events.php b/system/modules/calendar/dca/tl_calendar_events.php
@@ -603,7 +603,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if (!strlen($varValue))
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->title);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->title));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_calendar_events WHERE alias=?")

diff --git a/system/modules/faq/dca/tl_faq.php b/system/modules/faq/dca/tl_faq.php
@@ -344,7 +344,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if (!strlen($varValue))
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->question);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->question));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_faq WHERE alias=?")

diff --git a/system/modules/news/dca/tl_news.php b/system/modules/news/dca/tl_news.php
@@ -567,7 +567,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if (!strlen($varValue))
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->headline);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->headline));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_news WHERE alias=?")

diff --git a/system/modules/newsletter/dca/tl_newsletter.php b/system/modules/newsletter/dca/tl_newsletter.php
@@ -434,7 +434,7 @@ public function generateAlias($varValue, DataContainer $dc)
 		if (!strlen($varValue))
 		{
 			$autoAlias = true;
-			$varValue = standardize($dc->activeRecord->subject);
+			$varValue = standardize($this->restoreBasicEntities($dc->activeRecord->subject));
 		}
 
 		$objAlias = $this->Database->prepare("SELECT id FROM tl_newsletter WHERE alias=?")