fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-22 12:49:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/member/member.view.php
View file

@ -98,6 +98,7 @@
function _getDisplayedMemberInfo($memberInfo, $extendFormInfo, $memberConfig)
{
$logged_info = Context::get('logged_info');
$displayDatas = array();
foreach($memberConfig->signupForm as $no=>$formInfo)
{
@ -270,6 +271,7 @@
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$member_info->signature = $oMemberModel->getSignature($member_srl);
Context::set('member_info',$member_info);
// Get a list of extend join form
Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
@ -291,6 +293,8 @@
Context::set('editor', $editor);
}
$this->member_info = $member_info;
$oMemberAdminView = &getAdminView('member');
$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
Context::set('formTags', $formTags);
@ -382,7 +386,7 @@
**/
function dispMemberLoginForm() {
if(Context::get('is_logged')) {
Context::set('redirect_url', getUrl('act',''));
Context::set('redirect_url', getNotEncodedUrl('act',''));
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('redirect.html');
return;