mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-24 13:49:56 +09:00
merge from 1.5.3.2 (~r11225)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
54e3a72065
commit
77f5aa2671
313 changed files with 8058 additions and 14251 deletions
|
|
@ -94,8 +94,6 @@ class memberMobile extends member
|
|||
|
||||
Context::set('member_info', $this->memberInfo);
|
||||
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
|
||||
if ($this->memberInfo->member_srl == $logged_info->member_srl)
|
||||
Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
|
||||
$this->setTemplateFile('member_info_mobile');
|
||||
}
|
||||
|
||||
|
|
@ -153,8 +151,6 @@ class memberMobile extends member
|
|||
// Receive a member join form
|
||||
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
|
||||
|
||||
Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
|
||||
|
||||
// Call getEditor of the editor module and set it for signiture
|
||||
if($this->memberInfo->member_srl) {
|
||||
$oEditorModel = &getModel('editor');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue