From 51bd3c63d8f49f977a00233447c9df8e0b1f1bd7 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 11 Jun 2015 08:59:44 +0000
Subject: [PATCH] Fix 404 in portfolio

---
 framework/application/Bootstrap.php                      | 2 ++
 framework/application/Cubedesigners/Util.php             | 7 ++++---
 framework/application/views/helpers/Realisation.php      | 2 +-
 framework/application/views/helpers/RealisationsList.php | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 420d846..6d152b9 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -2,6 +2,8 @@
 
 class Bootstrap extends CubeIT_Bootstrap {
 
+	//	protected $_cacheNavigation = false;
+
 	protected function _initMinimum() {
 		parent::_initMinimum();
 		// If a project with html display (don't activate by default for web services apps
diff --git a/framework/application/Cubedesigners/Util.php b/framework/application/Cubedesigners/Util.php
index 5b247bb..7526c2b 100644
--- a/framework/application/Cubedesigners/Util.php
+++ b/framework/application/Cubedesigners/Util.php
@@ -4,18 +4,19 @@ class Cubedesigners_Util {
 
 	protected static $_categories = null;
 
-	public static function getCategoryById($id) {
+	public static function getCategoryById($id, $locale) {
 		self::_getCategories();
 		if (!isset(self::$_categories[$id])) {
 			return;
 		}
-		return CubeIT_Util_Cms::unserialize(self::$_categories[$id]->getName());
+		$res = CubeIT_Util_Cms::unserialize(self::$_categories[$id]->getName(), $locale);
+		return $res;
 	}
 
 	public static function generateAutoUri($datas, $template, $locale = null) {
 		$datas = CubeIT_Util_Cms::unserialize($datas, $locale);
 		if (isset($datas->categories)) {
-			$datas->categories = self::getCategoryById($datas->categories);
+			$datas->categories = self::getCategoryById($datas->categories, $locale);
 		}
 		return CubeIT_Navigation_Page::generateAutoUri($datas, $template, $locale);
 	}
diff --git a/framework/application/views/helpers/Realisation.php b/framework/application/views/helpers/Realisation.php
index 54a53bb..4c4a8dd 100644
--- a/framework/application/views/helpers/Realisation.php
+++ b/framework/application/views/helpers/Realisation.php
@@ -11,7 +11,7 @@ class Cubedesigners_View_Helper_Realisation extends CubeIT_View_Helper_Abstract
 		$res .= '<article class="realisation">';
 		$res .= '<div class="content">';
 		$res .= '<h1>' . $r->titre . '</h1>';
-		$res .= '<h2>' . Cubedesigners_Util::getCategoryById($r->categories) . '</h2>';
+		$res .= '<h2>' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . '</h2>';
 		$res .= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton'));
 		$res .= '</div>';
 
diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
index 8d391d5..bc50b51 100644
--- a/framework/application/views/helpers/RealisationsList.php
+++ b/framework/application/views/helpers/RealisationsList.php
@@ -8,7 +8,7 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
 
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$s = $db->select()->from('realisations')
-				->order('date DESC');
+			->order('date DESC');
 		if (!$acl) {
 			$s->where('online = ?', 1);
 		}
@@ -31,10 +31,10 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
 			$visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
 
 			$rea = $this->view->imageProcess($r->visuel, $r->titre, 170, 127);
-			$rea.='<h2>' . $r->titre . '</h2>';
-			$rea.='<h3>' . Cubedesigners_Util::getCategoryById($r->categories) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
+			$rea .= '<h2>' . $r->titre . '</h2>';
+			$rea .= '<h3>' . Cubedesigners_Util::getCategoryById($r->categories, $this->localeDefault()) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
 
-			$url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea']);
+			$url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], $this->localeDefault());
 
 			$res .= $this->link($rea, $url, array('data-id' => $r->id, 'data-cat' => $r->categories));
 		}
-- 
2.39.5