# [#29848] UTF8 SEF URLs are causing browser too many redirects

failures - additional patch. Thanks Nicholas
joomla · Jan 21, 2013 · d85341d · d85341d
1 parent 11f2f6d
commit d85341d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
@@ -130,6 +130,6 @@ public function getItem($itemId = null)
 	 */
 	public function getReturnPage()
 	{
-		return base64_encode(urldecode($this->getState('return_page')));
+		return base64_encode(urlencode($this->getState('return_page')));
 	}
 }
diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php
@@ -146,7 +146,7 @@
 		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
 		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
 		$link = new JURI($link1);
-		$link->setVar('return', base64_encode($returnURL));
+		$link->setVar('return', base64_encode(urlencode($returnURL)));
 	endif;
 ?>
 		<p class="readmore">

diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
@@ -157,7 +157,7 @@
 							$link = JRoute::_('index.php?option=com_users&view=login&Itemid='.$itemId);
 							$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($article->slug));
 							$fullURL = new JURI($link);
-							$fullURL->setVar('return', base64_encode($returnURL));
+							$fullURL->setVar('return', base64_encode(urlencode($returnURL)));
 						?>
 						<a href="<?php echo $fullURL; ?>" class="register">
 							<?php echo JText::_( 'COM_CONTENT_REGISTER_TO_READ_MORE' ); ?></a>

diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php
@@ -146,7 +146,7 @@
 		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
 		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
 		$link = new JURI($link1);
-		$link->setVar('return', base64_encode($returnURL));
+		$link->setVar('return', base64_encode(urlencode($returnURL)));
 	endif;
 ?>
 			<p class="readmore">

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -26,6 +26,9 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+21-Jan-2013 Jean-Marie Simonet
+ # [#29848] UTF8 SEF URLs are causing browser too many redirects failures - additional patch. Thanks Nicholas
+
 19-Jan-2013 Jean-Marie Simonet
  # [#29964] Files upload problem
 

diff --git a/templates/beez5/html/com_content/category/blog_item.php b/templates/beez5/html/com_content/category/blog_item.php
@@ -150,7 +150,7 @@
 		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
 		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug));
 		$link = new JURI($link1);
-		$link->setVar('return', base64_encode($returnURL));
+		$link->setVar('return', base64_encode(urlencode($returnURL)));
 	endif;
 ?>
 		<p class="readmore">

diff --git a/templates/beez5/html/com_content/category/default_articles.php b/templates/beez5/html/com_content/category/default_articles.php
@@ -150,7 +150,7 @@
 						$link = JRoute::_('index.php?option=com_users&view=login&Itemid='.$itemId);
 						$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($article->slug));
 						$fullURL = new JURI($link);
-						$fullURL->setVar('return', base64_encode($returnURL));
+						$fullURL->setVar('return', base64_encode(urlencode($returnURL)));
 					?>
 					<a href="<?php echo $fullURL; ?>" class="register">
 					<?php echo JText::_( 'COM_CONTENT_REGISTER_TO_READ_MORE' ); ?></a>

diff --git a/templates/beez5/html/com_content/featured/default_item.php b/templates/beez5/html/com_content/featured/default_item.php
@@ -156,7 +156,7 @@
 		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
 		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
 		$link = new JURI($link1);
-		$link->setVar('return', base64_encode($returnURL));
+		$link->setVar('return', base64_encode(urlencode($returnURL)));
 	endif;
 ?>
 		<p class="readmore">