friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  blockem: fix to work with changed 'display_item' hook

* master:
pull/43/head
Simon L'nu 2012-03-02 10:39:04 -05:00
parent 47429a3b58 e81e7f7e79
commit 472a019922
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
blockem.tgz
View File

Binary file not shown.

8
blockem/blockem.php
View File

@ -101,15 +101,15 @@ function blockem_prepare_body(&$a,&$b) {
} }
} }
if($found) { if($found) {
$rnd = random_string(8); $rnd = random_string(8);
$b['html'] = '<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>'; $b['html'] = '<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
} }
} }
function blockem_display_item(&$a,&$b) { function blockem_display_item(&$a,&$b) {
if(strstr($b['output'],'id="blockem-wrap-')) if(strstr($b['output']['body'],'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']); $b['output']['thumb'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
} }
@ -193,4 +193,4 @@ function blockem_init(&$a) {
set_pconfig(local_user(),'blockem','words',$words); set_pconfig(local_user(),'blockem','words',$words);
info( t('blockem settings updated') . EOL ); info( t('blockem settings updated') . EOL );
killme(); killme();
} }