clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bad checkin

This commit is contained in:
friendica 2013-05-02 22:19:16 -07:00
parent ed5768c4a3
commit 886c3d1472
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/network.php
View File

@ -819,12 +819,12 @@ function add_fcontact($arr,$update = false) {
}
function scale_external_images($s, $include_link = true, $scale_replace = false) {
function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
$a = get_app();
// Picture addresses can contain special characters
$s = htmlspecialchars_decode($s);
$s = htmlspecialchars_decode($srctext);
$matches = null;
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
@ -846,7 +846,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]);
else
$scaled = $mtch[1];
$i = fetch_url($scaled);
$i = @fetch_url($scaled);
if(! $i)
return $srctext;
$cachefile = get_cachefile(hash("md5", $scaled));
if ($cachefile != '') {

5
index.php
View File

@ -414,10 +414,7 @@ if(!$a->theme['stylesheet'])
$stylesheet = current_theme_url();
else
$stylesheet = $a->theme['stylesheet'];
// this creates hundreds of compiled templates, when all we really want is a string replace.
// $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
$a->page['htmlhead'] = str_replace('$stylesheet',$stylesheet,$a->page['htmlhead']);
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
$page = $a->page;
$profile = $a->profile;