can set group desc limit to unlimited without resetting global limit
This commit is contained in:
parent
9828c64ae8
commit
92ef4895b4
@ -301,7 +301,8 @@ class User_group extends Memcached_DataObject
|
|||||||
static function maxDescription()
|
static function maxDescription()
|
||||||
{
|
{
|
||||||
$desclimit = common_config('group', 'desclimit');
|
$desclimit = common_config('group', 'desclimit');
|
||||||
if (empty($desclimit)) {
|
// null => use global limit (distinct from 0!)
|
||||||
|
if (is_null($desclimit)) {
|
||||||
$desclimit = common_config('site', 'textlimit');
|
$desclimit = common_config('site', 'textlimit');
|
||||||
}
|
}
|
||||||
return $desclimit;
|
return $desclimit;
|
||||||
@ -310,6 +311,6 @@ class User_group extends Memcached_DataObject
|
|||||||
static function descriptionTooLong($desc)
|
static function descriptionTooLong($desc)
|
||||||
{
|
{
|
||||||
$desclimit = self::maxDescription();
|
$desclimit = self::maxDescription();
|
||||||
return (!empty($desclimit) && !empty($desc) && (mb_strlen($desc) > $desclimit));
|
return ($desclimit > 0 && !empty($desc) && (mb_strlen($desc) > $desclimit));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user