Fix 404 in portfolio

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 420d8461c4afbd1717fd66090b519ad0cebff034..6d152b940d81c15781ae3f3f064c44541807d204 100644 (file)
--- 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 5b247bb41673467c48482065eeaf9f41caeedd89..7526c2bf85bb260aa83ae36e4e05b1932d83ccd5 100644 (file)
--- 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 54a53bb7db13899a9caf35dfcb9e63f105c0e4e6..4c4a8ddf69da68fb31cfcbdaaac242dd4a2e5262 100644 (file)
--- 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 8d391d5a0b40a9e2bbb3822ddbafcb0dad1ee403..bc50b51f94c74df777edd582129acc061e917c03 100644 (file)
--- 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));
                }