friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

typo on previous checkin - set max number of images for an inserted link, default 2.

This commit is contained in:
friendica 2012-09-13 23:01:10 -07:00
parent 32d4a359f1
commit 20938d07cd
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/admin.php
View File

@ -355,7 +355,7 @@ function admin_page_site_post(&$a){
set_config('system','directory_submit_url', $global_directory); set_config('system','directory_submit_url', $global_directory);
} }
set_config('system','thread_allow', $thread_allow); set_config('system','thread_allow', $thread_allow);
set_config('system','newuser_private', $newuser_private; set_config('system','newuser_private', $newuser_private);
set_config('system','block_extended_register', $no_multi_reg); set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid); set_config('system','no_openid', $no_openid);

26
mod/parse_url.php
View File

@ -307,16 +307,26 @@ function parse_url_content(&$a) {
$image = ""; $image = "";
if(sizeof($siteinfo["images"]) > 0){ if(sizeof($siteinfo["images"]) > 0){
/* /* Execute below code only if image is present in siteinfo */
Execute below code only if image is present in siteinfo
*/ $total_images = 0;
foreach ($siteinfo["images"] as $imagedata) $max_images = get_config('system','max_bookmark_images');
if($textmode) if($max_images === false)
$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]'; $max_images = 2;
else else
$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" />'; $max_images = intval($max_images);
foreach ($siteinfo["images"] as $imagedata) {
if($textmode)
$image .= '[img='.$imagedata["width"].'x'.$imagedata["height"].']'.$imagedata["src"].'[/img]' . "\n";
else
$image .= '<img height="'.$imagedata["height"].'" width="'.$imagedata["width"].'" src="'.$imagedata["src"].'" alt="photo" /><br />';
$total_images ++;
if($max_images && $max_images >= $total_images)
break;
} }
}
if(strlen($text)) { if(strlen($text)) {
if($textmode) if($textmode)