GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

fix conflict with Robin's changes on trunk

Browse Source 
darcs-hash:20081203041730-5ed1f-1e1910cec75546291b14386d91f3bd22ae06b750.gz
This commit is contained in:
Evan Prodromou
2008-12-02 23:17:30 -05:00
parent 4b586436c8
commit f41e531737
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util.php
View File

@@ -842,8 +842,10 @@ function common_shorten_links($text) {
return $cache[$text] = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $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(); $user = common_current_user();
$curlh = curl_init(); $curlh = curl_init();