X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser_urlshortener_prefs.php;h=a9a70112c7b15e9428c81f9376a920b3cb9a37d5;hb=e8d1bb25469fe1ef0cbcb32c3022010997aca4b0;hp=600e4e1ac2f2a61b3fcb0ad119db9ca74eaf49b9;hpb=1a9a8ea73032b0ded09a8ea9a4c0511401507090;p=quix0rs-gnu-social.git

diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
old mode 100755
new mode 100644
index 600e4e1ac2..a9a70112c7
--- a/classes/User_urlshortener_prefs.php
+++ b/classes/User_urlshortener_prefs.php
@@ -44,7 +44,7 @@ class User_urlshortener_prefs extends Managed_DataObject
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
                 'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
                 'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
-                'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
+                'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, -1 = only if notice text is longer than max allowed'),
         
                 'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
                 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
@@ -58,7 +58,7 @@ class User_urlshortener_prefs extends Managed_DataObject
 
     static function maxUrlLength($user)
     {
-        $def = common_config('url', 'maxlength');
+        $def = common_config('url', 'maxurllength');
 
         $prefs = self::getPrefs($user);
 
@@ -74,7 +74,12 @@ class User_urlshortener_prefs extends Managed_DataObject
         $def = common_config('url', 'maxnoticelength');
 
         if ($def == -1) {
-            $def = Notice::maxContent();
+            /*
+             * maxContent==0 means infinite length,
+             * but maxNoticeLength==0 means "always shorten"
+             * so if maxContent==0 we must set this to -1
+             */
+            $def = Notice::maxContent() ?: -1;
         }
 
         $prefs = self::getPrefs($user);
@@ -109,7 +114,7 @@ class User_urlshortener_prefs extends Managed_DataObject
             return null;
         }
 
-        $prefs = User_urlshortener_prefs::staticGet('user_id', $user->id);
+        $prefs = User_urlshortener_prefs::getKV('user_id', $user->id);
 
         return $prefs;
     }