Authored by hf

code review by fei.hong: do merge yang.yang and shaofeng.zhou fixes bugs codes

... ... @@ -299,8 +299,6 @@ class AbstractAction extends Controller_Abstract
{
if ($this->_useSession) {
Session::start('yohobuy_session', null, 'yohobuy.com')->__set($name, $value);
} else {
Session::fileStart('yohobuy_session')->__set($name, $value);
}
}
... ... @@ -315,7 +313,7 @@ class AbstractAction extends Controller_Abstract
if ($this->_useSession) {
return Session::start('yohobuy_session', null, 'yohobuy.com')->__get($name);
} else {
return Session::fileStart('yohobuy_session')->__get($name);
return '';
}
}
... ... @@ -431,10 +429,10 @@ class AbstractAction extends Controller_Abstract
*
* @param string $title 头部标题
* @param mixed $backUrl 返回的链接
* @param string $homeUrl 返回首页的链接
* @param boolean $navBtn 是否显示右上角导航
* @return void
*/
protected function setNavHeader($title = '', $backUrl = true, $homeUrl = '/', $navBtn = false)
protected function setNavHeader($title = '', $backUrl = true, $navBtn = true)
{
$header = array();
... ... @@ -452,11 +450,16 @@ class AbstractAction extends Controller_Abstract
if (!empty($title)) {
$header['navTitle'] = $title;
}
if (!empty($homeUrl)) {
/*if (!empty($homeUrl)) {
$header['navHome'] = $homeUrl . '?go=1&t=' . time();
}
}*/
if ($navBtn) {
$header['navBtn'] = $navBtn;
$header['navBtn'] = array(
'indexUrl' => Helpers::url('/?go=1'), //首页
'categoryUrl' => Helpers::url('/cate'), // 分类
'shoppingCartUrl' => Helpers::url('/cart/index/index'), // 购物车
'mineUrl' => Helpers::url('/home'), // 我的
);
}
// 默认使用男生的头部
... ...