Compatibility fixes.

This commit is contained in:
Grischa Brockhaus 2012-06-13 14:24:45 +02:00
parent 0407a731de
commit 1f9630b394
17 changed files with 24 additions and 24 deletions

View File

@ -70,7 +70,7 @@ function &serendipity_printTrackbacks(&$trackbacks) {
function &serendipity_smarty_fetch($block, $file, $echo = false) {
global $serendipity;
$output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, null, ($echo === true && $serendipity['smarty_raw_mode']));
$output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, null, ($echo === true && $serendipity['smarty_raw_mode']));
$serendipity['smarty']->assignByRef($block, $output);

View File

@ -135,7 +135,7 @@ class serendipity_event_bbcode 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);
}

View File

@ -133,7 +133,7 @@ class serendipity_event_contentrewrite 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);
}
@ -229,7 +229,7 @@ class serendipity_event_contentrewrite extends serendipity_event
<?php
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -103,7 +103,7 @@ class serendipity_event_creativecommons extends serendipity_event {
$title = $this->title;
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$license_data = $this->get_license_data();

View File

@ -55,7 +55,7 @@ class serendipity_event_emoticate 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);
}
@ -151,7 +151,7 @@ class serendipity_event_emoticate extends serendipity_event
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -134,7 +134,7 @@ class serendipity_event_mailer extends serendipity_event
$title = $this->title;
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

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;

View File

@ -54,7 +54,7 @@ class serendipity_event_s9ymarkup 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);
}
@ -74,7 +74,7 @@ class serendipity_event_s9ymarkup extends serendipity_event
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -203,7 +203,7 @@ class serendipity_event_searchhighlight extends serendipity_event
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$this->uri = $_SERVER['HTTP_REFERER'];

View File

@ -1021,7 +1021,7 @@ class serendipity_event_spartacus extends serendipity_event
}
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -86,7 +86,7 @@ class serendipity_event_statistics extends serendipity_event
$title = $this->title;
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
@ -982,7 +982,7 @@ class serendipity_event_statistics extends serendipity_event
}
function uninstall(){
function uninstall(&$propbag){
$this->dropTables();

View File

@ -33,7 +33,7 @@ class serendipity_event_templatechooser extends serendipity_event
$title = $this->title;
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -69,7 +69,7 @@ class serendipity_event_textile 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);
}
@ -102,7 +102,7 @@ class serendipity_event_textile extends serendipity_event
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -526,7 +526,7 @@ class serendipity_event_textwiki 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);
}
@ -566,7 +566,7 @@ class serendipity_event_textwiki extends serendipity_event
}
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -57,7 +57,7 @@ class serendipity_event_trackexits 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);
}

View File

@ -95,7 +95,7 @@ class serendipity_event_weblogping extends serendipity_event
$title = PLUGIN_EVENT_WEBLOGPING_TITLE;
}
function event_hook($event, &$bag, &$eventData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');

View File

@ -73,7 +73,7 @@ class serendipity_event_xhtmlcleanup 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);
}