Ticket #2811 use more consistent max limit for OAuth application registration descrip...

diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index e81706104eaf6b9c17626d00db371d7d67bb1c0f..f1d4fb7a6f3a12e44a6bc1e38c0f3015fc3451a1 100644 (file)
--- 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)