Merge branch 'master' into bbcode

This commit is contained in:
Abinoam P. Marques Jr
2012-02-12 18:56:53 -08:00
6 changed files with 4175 additions and 3961 deletions

View File

@@ -11,7 +11,7 @@ function stripcode_br_cb($s) {
function tryoembed($match){
$url = ((count($match)==2)?$match[1]:$match[2]);
logger("tryoembed: $url");
// logger("tryoembed: $url");
$o = oembed_fetch_url($url);