eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

remove a bunch of common_debug() calls for url shortening

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-16 10:26:14 -04:00
parent 32aa061c17
commit c99f6f6afc
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util.php
View File

@ -1031,19 +1031,13 @@ function common_linkify($url) {
*/ */
function common_shorten_links($text, $always = false, User $user=null) function common_shorten_links($text, $always = false, User $user=null)
{ {
common_debug("common_shorten_links() called");
$user = common_current_user(); $user = common_current_user();
$maxLength = User_urlshortener_prefs::maxNoticeLength($user); $maxLength = User_urlshortener_prefs::maxNoticeLength($user);
common_debug("maxLength = $maxLength");
if ($always || mb_strlen($text) > $maxLength) { if ($always || mb_strlen($text) > $maxLength) {
common_debug("Forcing shortening");
return common_replace_urls_callback($text, array('File_redirection', 'forceShort'), $user); return common_replace_urls_callback($text, array('File_redirection', 'forceShort'), $user);
} else { } else {
common_debug("Not forcing shortening");
return common_replace_urls_callback($text, array('File_redirection', 'makeShort'), $user); return common_replace_urls_callback($text, array('File_redirection', 'makeShort'), $user);
} }
} }
@ -2066,27 +2060,21 @@ function common_database_tablename($tablename)
*/ */
function common_shorten_url($long_url, User $user=null, $force = false) function common_shorten_url($long_url, User $user=null, $force = false)
{ {
common_debug("Shortening URL '$long_url' (force = $force)");
$long_url = trim($long_url); $long_url = trim($long_url);
$user = common_current_user(); $user = common_current_user();
$maxUrlLength = User_urlshortener_prefs::maxUrlLength($user); $maxUrlLength = User_urlshortener_prefs::maxUrlLength($user);
common_debug("maxUrlLength = $maxUrlLength");
// $force forces shortening even if it's not strictly needed // $force forces shortening even if it's not strictly needed
// I doubt URL shortening is ever 'strictly' needed. - ESP // I doubt URL shortening is ever 'strictly' needed. - ESP
if (mb_strlen($long_url) < $maxUrlLength && !$force) { if (mb_strlen($long_url) < $maxUrlLength && !$force) {
common_debug("Skipped shortening URL.");
return $long_url; return $long_url;
} }
$shortenerName = User_urlshortener_prefs::urlShorteningService($user); $shortenerName = User_urlshortener_prefs::urlShorteningService($user);
common_debug("Shortener name = '$shortenerName'");
if (Event::handle('StartShortenUrl', if (Event::handle('StartShortenUrl',
array($long_url, $shortenerName, &$shortenedUrl))) { array($long_url, $shortenerName, &$shortenedUrl))) {
if ($shortenerName == 'internal') { if ($shortenerName == 'internal') {