fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 17:22:20 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/new-config-format

Browse source 
Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2016-02-05 19:37:10 +09:00
commit 5afefc063c
42 changed files with 435 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/member/member.model.php
View file

@ -685,6 +685,7 @@ class memberModel extends member
$column_title = $join_form_list[$i]->column_title;
$default_value = $join_form_list[$i]->default_value;
// Add language variable
if(!isset($lang->extend_vars)) $lang->extend_vars = array();
$lang->extend_vars[$column_name] = $column_title;
// unserialize if the data type if checkbox, select and so on
if(in_array($column_type, array('checkbox','select','radio')))