diff options
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php index cd9bd9ed8..0402e2401 100644 --- a/lib/util.php +++ b/lib/util.php @@ -570,7 +570,8 @@ function common_linkify($url) { function common_shorten_links($text) { - if (mb_strlen($text) <= 140) return $text; + $maxLength = Notice::maxContent(); + if ($maxLength == 0 || mb_strlen($text) <= $maxLength) return $text; return common_replace_urls_callback($text, array('File_redirection', 'makeShort')); } @@ -1152,7 +1153,8 @@ function common_negotiate_type($cprefs, $sprefs) function common_config($main, $sub) { global $config; - return isset($config[$main][$sub]) ? $config[$main][$sub] : false; + return (array_key_exists($main, $config) && + array_key_exists($sub, $config[$main])) ? $config[$main][$sub] : false; } function common_copy_args($from) |