summaryrefslogtreecommitdiff
path: root/classes/Oauth_application.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-10-11 12:52:32 -0700
committerBrion Vibber <brion@pobox.com>2010-10-11 12:52:32 -0700
commit1cd60579f5ac99a2c8bfb12d35093f5c74f14b04 (patch)
treebde6dc2188465a109657d8d3a6bcd2bfe2f877b2 /classes/Oauth_application.php
parent5215423ea908218566909ab628fad88e780ee1e8 (diff)
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.
Diffstat (limited to 'classes/Oauth_application.php')
-rw-r--r--classes/Oauth_application.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index e81706104..f1d4fb7a6 100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -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)