mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merged branch 'master' into 2.0 (compatibility fixes)

Browse Source
This commit is contained in:
Grischa Brockhaus
2012-06-13 15:12:35 +02:00
parent 3a3702f7a4 1f9630b394
commit e72c90a69d
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
View File

@ -88,7 +88,7 @@ class serendipity_event_nl2br extends serendipity_event
serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
}
function uninstall() {
function uninstall(&$propbag) {
serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
}
@ -156,7 +156,7 @@ class serendipity_event_nl2br extends serendipity_event
return preg_replace('~\001(\d+)~e', '$_buf[$1]', $text);
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $markup = null;
static $isolate = null;