Merge branch 'pull'

This commit is contained in:
Friendika
2011-05-23 18:18:01 -07:00
8 changed files with 222 additions and 110 deletions

View File

@@ -2,7 +2,6 @@
require_once('library/HTML5/Parser.php');
function parse_url_content(&$a) {
logger('parse_url: ' . $_GET['url']);
@@ -25,9 +24,9 @@ function parse_url_content(&$a) {
killme();
}
if($url)
if($url) {
$s = fetch_url($url);
else {
} else {
echo '';
killme();
}
@@ -97,4 +96,4 @@ function parse_url_content(&$a) {
echo sprintf($template,$url,$title,$text);
killme();
}
}