Merge remote branch 'upstream/master'

This commit is contained in:
Michael 2012-03-02 14:35:13 +01:00
commit 8c0560f427
2 changed files with 4 additions and 4 deletions

Binary file not shown.

View file

@ -108,8 +108,8 @@ function blockem_prepare_body(&$a,&$b) {
function blockem_display_item(&$a,&$b) {
if(strstr($b['output'],'id="blockem-wrap-'))
$b['output'] = preg_replace('/\<img(.*?)src=\"(.*?)\" class=\"wall\-item\-photo(.*?)\>/','<img$1src="' . $a->get_baseurl() . "/images/default-profile-sm.jpg" . '" class="wall-item-photo$3>',$b['output']);
if(strstr($b['output']['body'],'id="blockem-wrap-'))
$b['output']['thumb'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
}