fix conflict with Robin's changes on trunk
darcs-hash:20081203041730-5ed1f-1e1910cec75546291b14386d91f3bd22ae06b750.gz
This commit is contained in:
parent
4b586436c8
commit
f41e531737
|
@ -842,8 +842,10 @@ function common_shorten_links($text) {
|
|||
return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
|
||||
}
|
||||
|
||||
function common_shorten_link($long_url) {
|
||||
|
||||
function common_shorten_link($url, $reverse = false) {
|
||||
static $url_cache = array();
|
||||
if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
|
||||
|
||||
$user = common_current_user();
|
||||
|
||||
$curlh = curl_init();
|
||||
|
|
Loading…
Reference in New Issue
Block a user