upstream fixes

This commit is contained in:
friendica 2012-07-22 05:13:29 -07:00
parent 236ba8badc
commit 1f313eba50
3 changed files with 608 additions and 407 deletions

View file

@ -1687,3 +1687,14 @@ function build_querystring($params, $name=null) {
}
return $ret;
}
// much better way of dealing with c-style args
function argc() {
return get_app()->argc;
}
function argv($x) {
return get_app()->argv[$x];
}

File diff suppressed because it is too large Load diff

View file

@ -302,11 +302,16 @@ function parse_url_content(&$a) {
$image = "";
foreach ($siteinfo["images"] as $imagedata)
if($siteinfo["image"] != ""){
/*
Execute below code only if image is present in siteinfo
*/
foreach ($siteinfo["images"] as $imagedata)
if($textmode)
$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]';
else
$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />';
}
if(strlen($text)) {
if($textmode)