Projects / CakeBOOK

diff --git a/config/routes.php b/config/routes.php index 8f75fb9..83a7d16 100644 --- a/config/routes.php +++ b/config/routes.php @@ -70,10 +70,10 @@ foreach ($routes as $route) { Router::connect('/m/:lang' . $route[0], $route[1], $route[2]); $route[1]['theme'] = 'default'; // default layout - Router::connect($route[0], $route[1], $route[2]); $route[2]['lang'] = '[a-z]{2}'; Router::connect('/:lang' . $route[0], $route[1], $route[2]); + Router::connect($route[0], $route[1], $route[2]); } ?> \ No newline at end of file diff --git a/views/comments/index.ctp b/views/comments/index.ctp index 6428ceb..88cf9b9 100644 --- a/views/comments/index.ctp +++ b/views/comments/index.ctp @@ -17,5 +17,5 @@ if (!$data) { if (isset($node)) { echo $this->element('comment_form'); } -$html->meta('rss', am($this->params['pass'], array('ext' => 'rss')), array('title' => __('This page as a feed', true)), false); +$html->meta('rss', am($this->params['pass'], array('theme' => 'defaut', 'ext' => 'rss')), array('title' => __('This page as a feed', true)), false); ?> \ No newline at end of file diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index d6e41fe..13e6b00 100644 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -63,7 +63,7 @@ if ($session->read('Auth.User.id')) { $menu->add(array( 'section' => 'Feeds', 'title' => __('My Submissions', true), - 'url' => array('admin' => false, 'plugin' => false, 'controller' => 'changes', 'action' => 'index', 'user' => $userName, 'language' => '*', 'ext' => 'rss') + 'url' => array('theme' => 'default', 'admin' => false, 'plugin' => false, 'controller' => 'changes', 'action' => 'index', 'user' => $userName, 'language' => '*', 'ext' => 'rss') )); } ?></cake:nocache><?php diff --git a/views/nodes/view_all.ctp b/views/nodes/view_all.ctp index 48a711e..25fb61c 100644 --- a/views/nodes/view_all.ctp +++ b/views/nodes/view_all.ctp @@ -106,11 +106,11 @@ if ($currentNode['Node']['edit_level'] <= $auth['User']['Level']) { extract($this->data); $html->meta( 'rss', - array('plugin' => false, 'controller' => 'comments', 'action' => 'index', $Node['id'], $Revision['slug'], 'ext' => 'rss'), + array('theme' => 'default', 'plugin' => false, 'controller' => 'comments', 'action' => 'index', $Node['id'], $Revision['slug'], 'ext' => 'rss'), array('title' => sprintf(__('Comments for %s', true), $Revision['title'])) , false); $html->meta('rss', - array('plugin' => false, 'controller' => 'changes', 'action' => 'index', $Node['id'], 'ext' => 'rss'), + array('theme' => 'default', 'plugin' => false, 'controller' => 'changes', 'action' => 'index', $Node['id'], 'ext' => 'rss'), array('title' => sprintf(__('Change history for %s', true), $Revision['title'])) , false); ?><cake:nocache> <?php @@ -118,12 +118,12 @@ extract($this->data); $menu->add(array( 'section' => 'Feeds', 'title' => sprintf(__('Comments for %s', true), $Revision['title']), - 'url' => array('plugin' => false, 'controller' => 'comments', 'action' => 'index', $Node['id'], $Revision['slug'], 'ext' => 'rss'), + 'url' => array('theme' => 'default', 'plugin' => false, 'controller' => 'comments', 'action' => 'index', $Node['id'], $Revision['slug'], 'ext' => 'rss'), )); $menu->add(array( 'section' => 'Feeds', 'title' => sprintf(__('Change history for %s', true), $Revision['title']), - 'url' => array('plugin' => false, 'controller' => 'changes', 'action' => 'index', $Node['id'], 'ext' => 'rss'), + 'url' => array('theme' => 'default', 'plugin' => false, 'controller' => 'changes', 'action' => 'index', $Node['id'], 'ext' => 'rss'), )); ?></cake:nocache> \ No newline at end of file