GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Ticket #2811 use more consistent max limit for OAuth application registration descriptions; now using the field max of 255 rather than $config['site']['textlimit'] as fallback if $config['application']['desclimit'] is unset or out of bounds.

This commit is contained in:
Brion Vibber 2010-10-11 12:52:32 -07:00
parent 5215423ea9
commit 1cd60579f5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classes/Oauth_application.php
View File

@ -46,12 +46,19 @@ class Oauth_application extends Memcached_DataObject
static function maxDesc()
{
$desclimit = common_config('application', 'desclimit');
// null => use global limit (distinct from 0!)
if (is_null($desclimit)) {
$desclimit = common_config('site', 'textlimit');
// This used to default to textlimit or allow unlimited descriptions,
// but this isn't part of a notice and the field's limited to 255 chars
// in the DB, so those seem silly.
//
// Now just defaulting to 255 max unless a smaller application desclimit
// is actually set. Setting to 0 will use the maximum.
$max = 255;
$desclimit = intval(common_config('application', 'desclimit'));
if ($desclimit > 0 && $desclimit < $max) {
return $desclimit;
} else {
return $max;
}
return $desclimit;
}
static function descriptionTooLong($desc)