merge from branch 1.5.3.1 (r11063-r11081)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11096 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-08-27 07:02:59 +00:00
commit 90dbcd491a
4 changed files with 80 additions and 1 deletions

View file

@ -37,7 +37,7 @@
}
// Get terms of user
$config->agreement = self::_getAgreement();
$config->agreement = memberModel::_getAgreement();
if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
if(!$config->image_name_max_width) $config->image_name_max_width = 90;