fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 01:23:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3.1 (r10978-r11049)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11050 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-08-20 07:56:33 +00:00
commit 0b4f79f420
6 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@
}
// Get terms of user
$config->agreement = $this->_getAgreement();
$config->agreement = self::_getAgreement();
if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
if(!$config->image_name_max_width) $config->image_name_max_width = 90;
@ -213,7 +213,7 @@
if(!$user_id) return;
$args->user_id = $user_id;
$output = executeQuery('member.getMemberInfo', $args, $columnList);
$output = executeQuery('member.getMemberInfo', $args);
if(!$output->toBool()) return $output;
if(!$output->data) return;