Authored by yangyang

Merge branch 'feature/xingchao' into feature/wap4.3

@@ -20,7 +20,7 @@ class StarClassController extends AbstractAction @@ -20,7 +20,7 @@ class StarClassController extends AbstractAction
20 public function indexAction() 20 public function indexAction()
21 { 21 {
22 //获取uid 22 //获取uid
23 - $uid = self::getLoggedUid(); 23 + $uid = $this->getLoggedUid();
24 $appVersion = array(); 24 $appVersion = array();
25 if (!$this->_isApp) { 25 if (!$this->_isApp) {
26 //设置头部公共导航 26 //设置头部公共导航
@@ -46,7 +46,7 @@ class StarClassController extends AbstractAction @@ -46,7 +46,7 @@ class StarClassController extends AbstractAction
46 public function specialAction() 46 public function specialAction()
47 { 47 {
48 //获取uid 48 //获取uid
49 - $uid = self::getLoggedUid(); 49 + $uid = $this->getLoggedUid();
50 $appVersion = array(); 50 $appVersion = array();
51 if (!$this->_isApp) { 51 if (!$this->_isApp) {
52 //设置头部公共导航 52 //设置头部公共导航
@@ -73,7 +73,7 @@ class StarClassController extends AbstractAction @@ -73,7 +73,7 @@ class StarClassController extends AbstractAction
73 public function collocationAction() 73 public function collocationAction()
74 { 74 {
75 //获取uid 75 //获取uid
76 - $uid = self::getLoggedUid(); 76 + $uid = $this->getLoggedUid();
77 $appVersion = array(); 77 $appVersion = array();
78 if (!$this->_isApp) { 78 if (!$this->_isApp) {
79 //设置头部公共导航 79 //设置头部公共导航
@@ -125,7 +125,7 @@ class StarClassController extends AbstractAction @@ -125,7 +125,7 @@ class StarClassController extends AbstractAction
125 public function topAction() 125 public function topAction()
126 { 126 {
127 //获取uid 127 //获取uid
128 - $uid = self::getLoggedUid(); 128 + $uid = $this->getLoggedUid();
129 $appVersion = array(); 129 $appVersion = array();
130 //设置头部公共导航(此处返回键调转星潮教室首页) 130 //设置头部公共导航(此处返回键调转星潮教室首页)
131 if (!$this->_isApp) { 131 if (!$this->_isApp) {