diff --git a/alpha/serendipity_event_mailcc.php b/alpha/serendipity_event_mailcc.php
index 139e08a0..cd2b7aa9 100644
--- a/alpha/serendipity_event_mailcc.php
+++ b/alpha/serendipity_event_mailcc.php
@@ -15,7 +15,7 @@ class serendipity_event_mailcc extends serendipity_event
$propbag->add('description', '(Notice: Make sure that the all of your authors have the option to receiv comment notification emails activated, or else no mails will be created that can be CCed');
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.0');
+ $propbag->add('version', '1.01');
$propbag->add('requirements', array('serendipity' => '0.8','smarty' => '2.6.7','php' => '4.1.0'
));
$propbag->add('groups', array('BACKEND_FEATURES'));
@@ -39,7 +39,7 @@ class serendipity_event_mailcc extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/alpha/serendipity_event_smfmarkup.php b/alpha/serendipity_event_smfmarkup.php
index 8349735a..a8b5dffc 100644
--- a/alpha/serendipity_event_smfmarkup.php
+++ b/alpha/serendipity_event_smfmarkup.php
@@ -24,7 +24,7 @@ class serendipity_event_smfmarkup extends serendipity_event
$propbag->add('description', 'SMF Markup');
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.00');
+ $propbag->add('version', '1.01');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -81,7 +81,7 @@ class serendipity_event_smfmarkup 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);
}
@@ -116,7 +116,7 @@ class serendipity_event_smfmarkup extends serendipity_event
return $input;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/alpha/stalkerbuster/serendipity_event_stalkerbuster.php b/alpha/stalkerbuster/serendipity_event_stalkerbuster.php
index 8eee7aab..ebdb9dd8 100644
--- a/alpha/stalkerbuster/serendipity_event_stalkerbuster.php
+++ b/alpha/stalkerbuster/serendipity_event_stalkerbuster.php
@@ -24,7 +24,7 @@ class serendipity_event_stalkerbuster extends serendipity_event {
$propbag->add('description', PLUGIN_STALKERBUSTER_DESC);
$propbag->add('stackable', true);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.0');
+ $propbag->add('version', '1.01');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -61,7 +61,7 @@ class serendipity_event_stalkerbuster extends serendipity_event {
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_aggregator/serendipity_event_aggregator.php b/serendipity_event_aggregator/serendipity_event_aggregator.php
index 49611b55..5692a5d5 100644
--- a/serendipity_event_aggregator/serendipity_event_aggregator.php
+++ b/serendipity_event_aggregator/serendipity_event_aggregator.php
@@ -72,7 +72,7 @@ class serendipity_event_aggregator extends serendipity_event {
'php' => '4.1.0'
));
- $propbag->add('version', '0.29');
+ $propbag->add('version', '0.30');
$propbag->add('author', 'Evan Nemerson, Garvin Hicking, Kristian Koehntopp, Thomas Schulz, Claus Schmidt');
$propbag->add('stackable', false);
$propbag->add('event_hooks', array(
@@ -1663,7 +1663,7 @@ class serendipity_event_aggregator extends serendipity_event {
return $content;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php b/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php
index e1620188..fd3a2749 100644
--- a/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php
+++ b/serendipity_event_amazonchooser/serendipity_event_amazonchooser.php
@@ -28,7 +28,7 @@ class serendipity_event_amazonchooser extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_AMAZONCHOOSER_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Matthew Groeninger');
- $propbag->add('version', '0.71');
+ $propbag->add('version', '0.72');
$propbag->add('requirements', array(
'serendipity' => '1.4',
'smarty' => '2.6.7',
@@ -104,7 +104,7 @@ class serendipity_event_amazonchooser extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_autotitle/serendipity_event_autotitle.php b/serendipity_event_autotitle/serendipity_event_autotitle.php
index 49c044cb..8fc54303 100755
--- a/serendipity_event_autotitle/serendipity_event_autotitle.php
+++ b/serendipity_event_autotitle/serendipity_event_autotitle.php
@@ -31,7 +31,7 @@ class serendipity_event_autotitle extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_AUTOTITLE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
- $propbag->add('version', '0.1.9');
+ $propbag->add('version', '0.1.10');
$propbag->add('requirements', array(
'php' => '4.1.0'
));
@@ -69,7 +69,7 @@ class serendipity_event_autotitle 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);
}
@@ -97,7 +97,7 @@ class serendipity_event_autotitle extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_autoupdate/serendipity_event_autoupdate.php b/serendipity_event_autoupdate/serendipity_event_autoupdate.php
index 100781fc..b0de3b34 100644
--- a/serendipity_event_autoupdate/serendipity_event_autoupdate.php
+++ b/serendipity_event_autoupdate/serendipity_event_autoupdate.php
@@ -23,7 +23,7 @@ class serendipity_event_autoupdate extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_AUTOUPDATE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'onli');
- $propbag->add('version', '0.2');
+ $propbag->add('version', '0.3');
$propbag->add('requirements', array(
'serendipity' => '0.8'
));
@@ -43,7 +43,7 @@ class serendipity_event_autoupdate extends serendipity_event {
}*/
- function event_hook($event, &$bag, &$eventData, $addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_backend/serendipity_event_backend.php b/serendipity_event_backend/serendipity_event_backend.php
index 02d7e187..dede1609 100644
--- a/serendipity_event_backend/serendipity_event_backend.php
+++ b/serendipity_event_backend/serendipity_event_backend.php
@@ -34,7 +34,7 @@ class serendipity_event_backend extends serendipity_event {
'php' => '4.1.0'
));
- $propbag->add('version', '0.5');
+ $propbag->add('version', '0.6');
$propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org');
$propbag->add('stackable', false);
$propbag->add('event_hooks', array(
@@ -68,7 +68,7 @@ class serendipity_event_backend extends serendipity_event {
$title = PLUGIN_BACKEND_TITLE;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_backendrss/serendipity_event_backendrss.php b/serendipity_event_backendrss/serendipity_event_backendrss.php
index 97cb484f..37e01832 100755
--- a/serendipity_event_backendrss/serendipity_event_backendrss.php
+++ b/serendipity_event_backendrss/serendipity_event_backendrss.php
@@ -27,7 +27,7 @@ class serendipity_event_backendrss extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_BACKENDRSS_DESC);
$propbag->add('stackable', true);
$propbag->add('author', 'Sebastian Nohn');
- $propbag->add('version', '1.3');
+ $propbag->add('version', '1.4');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'php' => '4.1.0'
@@ -121,7 +121,7 @@ class serendipity_event_backendrss 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');
diff --git a/serendipity_event_backup/serendipity_event_backup.php b/serendipity_event_backup/serendipity_event_backup.php
index 4cf1b9cb..3f7a3ae6 100755
--- a/serendipity_event_backup/serendipity_event_backup.php
+++ b/serendipity_event_backup/serendipity_event_backup.php
@@ -38,7 +38,7 @@ class serendipity_event_backup extends serendipity_event {
'php' => '4.1.0'
));
- $propbag->add('version', '0.11');
+ $propbag->add('version', '0.12');
$propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org');
$propbag->add('stackable', false);
$propbag->add('event_hooks', array(
@@ -170,8 +170,8 @@ class serendipity_event_backup extends serendipity_event {
- function uninstall() {
- global $serendipity;
+ function uninstall(&$propbag) {
+ global $serendipity;
serendipity_db_query("DROP TABLE {$serendipity['dbPrefix']}dma_sqlbackup");
serendipity_db_query("DROP TABLE {$serendipity['dbPrefix']}dma_htmlbackup");
@@ -1394,7 +1394,7 @@ class serendipity_event_backup extends serendipity_event {
$this->setupDB();
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_blogpdf/serendipity_event_blogpdf.php b/serendipity_event_blogpdf/serendipity_event_blogpdf.php
index a894dfa0..86e737c1 100644
--- a/serendipity_event_blogpdf/serendipity_event_blogpdf.php
+++ b/serendipity_event_blogpdf/serendipity_event_blogpdf.php
@@ -46,7 +46,7 @@ class serendipity_event_blogpdf extends serendipity_event
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Olivier PLATHEY, Steven Wittens');
$propbag->add('license', 'GPL (Uses LGPL FPDF, HTML2PDF, UFPDF');
- $propbag->add('version', '1.81');
+ $propbag->add('version', '1.82');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -93,7 +93,7 @@ class serendipity_event_blogpdf 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');
diff --git a/serendipity_event_cachesimple/serendipity_event_cachesimple.php b/serendipity_event_cachesimple/serendipity_event_cachesimple.php
index 6d022d3e..182be73e 100644
--- a/serendipity_event_cachesimple/serendipity_event_cachesimple.php
+++ b/serendipity_event_cachesimple/serendipity_event_cachesimple.php
@@ -75,7 +75,7 @@ class serendipity_event_cachesimple extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CACHESIMPLE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.1');
+ $propbag->add('version', '1.2');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -203,7 +203,7 @@ class serendipity_event_cachesimple extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = array();
@@ -418,7 +418,7 @@ document.getElementById('serendipity_commentform_url').value = getCommentCooki
$this->cache->clean($this->cache_group);
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
@include_once 'Cache/Lite.php';
diff --git a/serendipity_event_cal/serendipity_event_cal.php b/serendipity_event_cal/serendipity_event_cal.php
index 15c32fb5..6b5423e7 100644
--- a/serendipity_event_cal/serendipity_event_cal.php
+++ b/serendipity_event_cal/serendipity_event_cal.php
@@ -76,7 +76,7 @@ class serendipity_event_cal extends serendipity_event {
)
);
$propbag->add('author', 'Ian (Timbalu)');
- $propbag->add('version', '1.66');
+ $propbag->add('version', '1.67');
$propbag->add('groups', array('FRONTEND_FEATURES', 'BACKEND_FEATURES'));
$propbag->add('requirements', array(
'serendipity' => '1.4',
@@ -2375,7 +2375,7 @@ class serendipity_event_cal extends serendipity_event {
}
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
if(isset($serendipity['eventcaldroptable']) === true) {
diff --git a/serendipity_event_commentedit/serendipity_event_commentedit.php b/serendipity_event_commentedit/serendipity_event_commentedit.php
index 8a4c5649..38c7e171 100644
--- a/serendipity_event_commentedit/serendipity_event_commentedit.php
+++ b/serendipity_event_commentedit/serendipity_event_commentedit.php
@@ -30,7 +30,7 @@ class serendipity_event_commentedit extends serendipity_event
'serendipity' => '1.5',
'php' => '5.2.0'
));
- $propbag->add('version', '0.2.2');
+ $propbag->add('version', '0.2.3');
$propbag->add('event_hooks', array(
'frontend_saveComment_finish' => true,
'fetchcomments' => true,
@@ -82,7 +82,7 @@ class serendipity_event_commentedit extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData, $addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_cpgselector/serendipity_event_cpgselector.php b/serendipity_event_cpgselector/serendipity_event_cpgselector.php
index af7c8f26..f5e677ba 100644
--- a/serendipity_event_cpgselector/serendipity_event_cpgselector.php
+++ b/serendipity_event_cpgselector/serendipity_event_cpgselector.php
@@ -33,7 +33,7 @@ class serendipity_event_cpgselector extends serendipity_event
$propbag->add('stackable', false);
$propbag->add('author', 'Matthew Maude (modified by Jim Davies)');
- $propbag->add('version', '2.06');
+ $propbag->add('version', '2.07');
$propbag->add('requirements', array('serendipity' => '0.8'));
$propbag->add('configuration', array('server', 'database', 'prefix', 'user', 'password', 'path', 'button', 'usenormal', 'maxwidth', 'maxheight'));
@@ -134,7 +134,7 @@ class serendipity_event_cpgselector extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
global $CPG;
diff --git a/serendipity_event_cronjob/serendipity_event_cronjob.php b/serendipity_event_cronjob/serendipity_event_cronjob.php
index 741924f0..50691985 100644
--- a/serendipity_event_cronjob/serendipity_event_cronjob.php
+++ b/serendipity_event_cronjob/serendipity_event_cronjob.php
@@ -22,7 +22,7 @@ class serendipity_event_cronjob extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_CRONJOB_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '0.6');
+ $propbag->add('version', '0.7');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'php' => '4.1.0'
@@ -122,7 +122,7 @@ class serendipity_event_cronjob extends serendipity_event {
$r = serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}cronjoblog (timestamp, type, reason) VALUES ($now, '$type', '" . serendipity_db_escape_string($msg) . "')");
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_dbclean/serendipity_event_dbclean.php b/serendipity_event_dbclean/serendipity_event_dbclean.php
index bcf4295e..92d46877 100644
--- a/serendipity_event_dbclean/serendipity_event_dbclean.php
+++ b/serendipity_event_dbclean/serendipity_event_dbclean.php
@@ -24,7 +24,7 @@ class serendipity_event_dbclean extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_DBCLEAN_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
- $propbag->add('version', '0.2.3');
+ $propbag->add('version', '0.2.4');
$propbag->add('requirements', array(
'serendipity' => '0.8'
));
@@ -47,7 +47,7 @@ class serendipity_event_dbclean extends serendipity_event {
}*/
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php b/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php
index 927f9039..9e133de5 100755
--- a/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php
+++ b/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php
@@ -48,7 +48,7 @@ class serendipity_event_downloadmanager extends serendipity_event {
'php' => '5.0.0'
));
- $propbag->add('version', '0.27');
+ $propbag->add('version', '0.28');
$propbag->add('author', 'Alexander \'dma147\' Mieland, Grischa Brockhaus, Ian (Timbalu)');
$propbag->add('stackable', false);
$propbag->add('event_hooks', array(
@@ -414,7 +414,7 @@ class serendipity_event_downloadmanager extends serendipity_event {
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
serendipity_db_query("DROP TABLE {$serendipity['dbPrefix']}dma_downloadmanager_files");
@@ -1708,7 +1708,7 @@ class serendipity_event_downloadmanager extends serendipity_event {
$this->setupDB();
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_dpsyntaxhighlighter/serendipity_event_dpsyntaxhighlighter.php b/serendipity_event_dpsyntaxhighlighter/serendipity_event_dpsyntaxhighlighter.php
index 7098338f..be029caf 100755
--- a/serendipity_event_dpsyntaxhighlighter/serendipity_event_dpsyntaxhighlighter.php
+++ b/serendipity_event_dpsyntaxhighlighter/serendipity_event_dpsyntaxhighlighter.php
@@ -19,7 +19,7 @@ class serendipity_event_dpsyntaxhighlighter extends serendipity_event {
var $title = PLUGIN_EVENT_DPSYNTAXHIGHLIGHTER_NAME;
- var $version = '2.1.364'; // helps to be easily able to upgrade on upstream upgrade
+ var $version = '2.1.365'; // helps to be easily able to upgrade on upstream upgrade
/* _get_directory_match support function:
* read files from $dir that match regexp $tomatch and store matches in
@@ -91,7 +91,7 @@ class serendipity_event_dpsyntaxhighlighter extends serendipity_event {
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $regex = null;
static $sub = null;
diff --git a/serendipity_event_email_bot_obfuscator/serendipity_event_email_bot_obfuscator.php b/serendipity_event_email_bot_obfuscator/serendipity_event_email_bot_obfuscator.php
index 7ab0970a..215192a8 100644
--- a/serendipity_event_email_bot_obfuscator/serendipity_event_email_bot_obfuscator.php
+++ b/serendipity_event_email_bot_obfuscator/serendipity_event_email_bot_obfuscator.php
@@ -25,7 +25,7 @@ class serendipity_event_email_bot_obfuscator extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_EMAIL_BOT_OBFUSCATOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Stephan Manske');
- $propbag->add('version', '1.0');
+ $propbag->add('version', '1.01');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -79,7 +79,7 @@ class serendipity_event_email_bot_obfuscator 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);
}
@@ -197,7 +197,7 @@ function anti_email_spam ($text)
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_emoticonchooser/serendipity_event_emoticonchooser.php b/serendipity_event_emoticonchooser/serendipity_event_emoticonchooser.php
index 06551f14..72d24d96 100644
--- a/serendipity_event_emoticonchooser/serendipity_event_emoticonchooser.php
+++ b/serendipity_event_emoticonchooser/serendipity_event_emoticonchooser.php
@@ -30,7 +30,7 @@ class serendipity_event_emoticonchooser extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '1.7');
+ $propbag->add('version', '1.8');
$propbag->add('event_hooks', array(
'backend_entry_toolbar_extended' => true,
'backend_entry_toolbar_body' => true,
@@ -75,7 +75,7 @@ class serendipity_event_emoticonchooser extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
if (!class_exists('serendipity_event_emoticate')) {
diff --git a/serendipity_event_entrycheck/serendipity_event_entrycheck.php b/serendipity_event_entrycheck/serendipity_event_entrycheck.php
index dc64fb90..33839696 100644
--- a/serendipity_event_entrycheck/serendipity_event_entrycheck.php
+++ b/serendipity_event_entrycheck/serendipity_event_entrycheck.php
@@ -25,7 +25,7 @@ class serendipity_event_entrycheck extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_ENTRYCHECK_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Gregor Voeltz');
- $propbag->add('version', '1.15');
+ $propbag->add('version', '1.16');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -137,7 +137,7 @@ class serendipity_event_entrycheck extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $state, $locked;
diff --git a/serendipity_event_externalauth/serendipity_event_externalauth.php b/serendipity_event_externalauth/serendipity_event_externalauth.php
index 7239e00b..08f7edb7 100644
--- a/serendipity_event_externalauth/serendipity_event_externalauth.php
+++ b/serendipity_event_externalauth/serendipity_event_externalauth.php
@@ -24,7 +24,7 @@ class serendipity_event_externalauth extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking/Justin Alcorn');
- $propbag->add('version', '1.22');
+ $propbag->add('version', '1.23');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -249,7 +249,7 @@ class serendipity_event_externalauth extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_facebook/serendipity_event_facebook.php b/serendipity_event_facebook/serendipity_event_facebook.php
index 70bcea19..c4a1f8e6 100755
--- a/serendipity_event_facebook/serendipity_event_facebook.php
+++ b/serendipity_event_facebook/serendipity_event_facebook.php
@@ -33,7 +33,7 @@ class serendipity_event_facebook extends serendipity_event {
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '0.3');
+ $propbag->add('version', '0.4');
$propbag->add('groups', array('FRONTEND_VIEWS'));
$propbag->add('event_hooks', array(
'frontend_display' => true,
@@ -331,7 +331,7 @@ class serendipity_event_facebook extends serendipity_event {
}
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_fckeditor/serendipity_event_fckeditor.php b/serendipity_event_fckeditor/serendipity_event_fckeditor.php
index 358021a7..15e254da 100644
--- a/serendipity_event_fckeditor/serendipity_event_fckeditor.php
+++ b/serendipity_event_fckeditor/serendipity_event_fckeditor.php
@@ -31,7 +31,7 @@ class serendipity_event_fckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FCKEDITOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Ziyad Saeed, Garvin Hicking');
- $propbag->add('version', '0.6');
+ $propbag->add('version', '0.7');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -66,7 +66,7 @@ class serendipity_event_fckeditor 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');
diff --git a/serendipity_event_filter_entries/serendipity_event_filter_entries.php b/serendipity_event_filter_entries/serendipity_event_filter_entries.php
index 81085702..7da6ed48 100644
--- a/serendipity_event_filter_entries/serendipity_event_filter_entries.php
+++ b/serendipity_event_filter_entries/serendipity_event_filter_entries.php
@@ -26,7 +26,7 @@ class serendipity_event_filter_entries extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FILTER_ENTRIES_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.4');
+ $propbag->add('version', '1.5');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -45,7 +45,7 @@ class serendipity_event_filter_entries 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');
diff --git a/serendipity_event_flattr/serendipity_event_flattr.php b/serendipity_event_flattr/serendipity_event_flattr.php
index 087e5e88..cc47ccc9 100644
--- a/serendipity_event_flattr/serendipity_event_flattr.php
+++ b/serendipity_event_flattr/serendipity_event_flattr.php
@@ -54,7 +54,7 @@ class serendipity_event_flattr extends serendipity_event {
'flattr_pop',
));
$propbag->add('author', 'Garvin Hicking, Joachim Breitner', 'Matthias Gutjahr');
- $propbag->add('version', '1.9');
+ $propbag->add('version', '1.10');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
@@ -223,7 +223,7 @@ class serendipity_event_flattr extends serendipity_event {
* @param mixed $addData
* @return bool
*/
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
switch ($event) {
diff --git a/serendipity_event_flickr/serendipity_event_flickr.php b/serendipity_event_flickr/serendipity_event_flickr.php
index 2cb459b9..8e2fff24 100644
--- a/serendipity_event_flickr/serendipity_event_flickr.php
+++ b/serendipity_event_flickr/serendipity_event_flickr.php
@@ -31,7 +31,7 @@ class serendipity_event_flickr extends serendipity_event
$propbag->add('stackable', false);
$propbag->add('license', 'GPL');
$propbag->add('author', 'Jay Bertrand');
- $propbag->add('version', '0.3');
+ $propbag->add('version', '0.4');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -73,7 +73,7 @@ class serendipity_event_flickr extends serendipity_event
}
// do the hook job
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_forgotpassword/serendipity_event_forgotpassword.php b/serendipity_event_forgotpassword/serendipity_event_forgotpassword.php
index fe1683e3..83bfc19e 100644
--- a/serendipity_event_forgotpassword/serendipity_event_forgotpassword.php
+++ b/serendipity_event_forgotpassword/serendipity_event_forgotpassword.php
@@ -23,7 +23,7 @@ class serendipity_event_forgotpassword extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FORGOTPASSWORD_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Omid Mottaghi');
- $propbag->add('version', '0.11');
+ $propbag->add('version', '0.12');
$propbag->add('requirements', array(
'serendipity' => '0.9.1',
'smarty' => '2.6.7',
@@ -65,7 +65,7 @@ class serendipity_event_forgotpassword extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
@@ -262,8 +262,8 @@ class serendipity_event_forgotpassword extends serendipity_event
serendipity_db_schema_import($q);
}
- function uninstall(){
- global $serendipity;
+ function uninstall(&$propbag) {
+ global $serendipity;
// Drop tables
$q = "DROP TABLE ".$serendipity['dbPrefix']."forgotpassword";
diff --git a/serendipity_event_forum/serendipity_event_forum.php b/serendipity_event_forum/serendipity_event_forum.php
index ef5df7a3..bce8756a 100644
--- a/serendipity_event_forum/serendipity_event_forum.php
+++ b/serendipity_event_forum/serendipity_event_forum.php
@@ -53,7 +53,7 @@ class serendipity_event_forum extends serendipity_event {
'php' => '4.1.0'
));
- $propbag->add('version', '0.34');
+ $propbag->add('version', '0.35');
$propbag->add('author', 'Alexander \'dma147\' Mieland, http://blog.linux-stats.org, dma147@linux-stats.org');
$propbag->add('stackable', false);
$propbag->add('event_hooks', array(
@@ -733,7 +733,7 @@ class serendipity_event_forum extends serendipity_event {
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
serendipity_db_query("DROP TABLE {$serendipity['dbPrefix']}dma_forum_boards");
@@ -2315,7 +2315,7 @@ class serendipity_event_forum extends serendipity_event {
}
}
- function event_hook($event, &$bag, &$eventData, $addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $phpbb_mirror = null;
diff --git a/serendipity_event_freetag/serendipity_event_freetag.php b/serendipity_event_freetag/serendipity_event_freetag.php
index e7684164..65356907 100644
--- a/serendipity_event_freetag/serendipity_event_freetag.php
+++ b/serendipity_event_freetag/serendipity_event_freetag.php
@@ -70,7 +70,7 @@ class serendipity_event_freetag extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '3.39');
+ $propbag->add('version', '3.40');
$propbag->add('event_hooks', array(
'frontend_fetchentries' => true,
'frontend_fetchentry' => true,
@@ -384,7 +384,7 @@ class serendipity_event_freetag extends serendipity_event
}
}
- function makeURLTag($tag) {
+ static function makeURLTag($tag) {
return str_replace('.', '%FF', urlencode($tag));
}
@@ -513,7 +513,7 @@ class serendipity_event_freetag extends serendipity_event
/* This method can be called statically.
Tags should be an array with the key being the tag name, and val being
the number of occurances. */
- function displayTags($tags, $xml, $nl, $scaling, $maxSize = 200, $minSize = 100, $useFlash = false, $flashbgtrans = true, $flashtagcolor = 'ff6600', $flashbgcolor = 'ffffff', $flashwidth = 190, $flashspeed = 100)
+ static function displayTags($tags, $xml, $nl, $scaling, $maxSize = 200, $minSize = 100, $useFlash = false, $flashbgtrans = true, $flashtagcolor = 'ff6600', $flashbgcolor = 'ffffff', $flashwidth = 190, $flashspeed = 100, $cfg_taglink, $cfg_template, $xml_image = 'img/xml.gif')
{
global $serendipity;
@@ -523,12 +523,12 @@ class serendipity_event_freetag extends serendipity_event
static $taglink = null;
if ($taglink == null) {
- $taglink = $this->get_config('taglink');
+ $taglink = $cfg_taglink;
}
- $template = $this->get_config('template');
+ $template = $cfg_template;
if (!$template) {
- serendipity_event_freetag::renderTags($tags, $xml, $nl, $scaling, $maxSize, $minSize, $useFlash, $flashbgtrans, $flashtagcolor, $flashbgcolor, $flashwidth, $flashspeed, $taglink);
+ serendipity_event_freetag::renderTags($tags, $xml, $nl, $scaling, $maxSize, $minSize, $useFlash, $flashbgtrans, $flashtagcolor, $flashbgcolor, $flashwidth, $flashspeed, $taglink, $xml_image);
} else {
arsort($tags);
$tagsWithLinks = array();
@@ -546,12 +546,12 @@ class serendipity_event_freetag extends serendipity_event
}
- function renderTags($tags, $xml, $nl, $scaling, $maxSize, $minSize, $useFlash, $flashbgtrans, $flashtagcolor, $flashbgcolor, $flashwidth, $flashspeed, $taglink)
+ static function renderTags($tags, $xml, $nl, $scaling, $maxSize, $minSize, $useFlash, $flashbgtrans, $flashtagcolor, $flashbgcolor, $flashwidth, $flashspeed, $taglink, $xml_image = 'img/xml.gif')
{
global $serendipity;
$rsslink = $serendipity['serendipityHTTPPath'] . 'rss.php?serendipity%5Btag%5D=';
- $xmlImg = serendipity_getTemplateFile($this->get_config('xml_image','img/xml.gif'));
+ $xmlImg = serendipity_getTemplateFile($xml_image);
$first = true;
$biggest = max($tags);
@@ -1188,7 +1188,7 @@ class serendipity_event_freetag extends serendipity_event
$eventData = $this->addTags($entry, $tags, $eventData);
if ($show_related) {
- $relatedEntries =& $this->getRelatedEntries($tags, $eventData[$entry]['id']);
+ $relatedEntries = $this->getRelatedEntries($tags, $eventData[$entry]['id']);
$eventData = $this->addRelatedEntries($entry, $manyEntries, $relatedEntries, $eventData);
}
}
@@ -1327,7 +1327,8 @@ class serendipity_event_freetag extends serendipity_event
serendipity_db_bool($this->get_config('use_flash')),
serendipity_db_bool($this->get_config('flash_bg_trans', true)),
$this->get_config('flash_tag_color', 'ff6600'), $this->get_config('flash_bg_color', 'ffffff'),
- $this->get_config('flash_width', 600), $this->get_config('flash_speed', 100));
+ $this->get_config('flash_width', 600), $this->get_config('flash_speed', 100),
+ $this->get_config('taglink'), $this->get_config('template'), $this->get_config('xml_image','img/xml.gif'));
$tagout = ob_get_contents();
ob_end_clean();
$serendipity['smarty']->assign('freetag_displayTags', $tagout);
diff --git a/serendipity_event_freetag/serendipity_plugin_freetag.php b/serendipity_event_freetag/serendipity_plugin_freetag.php
index a3d5b727..638b8ef3 100644
--- a/serendipity_event_freetag/serendipity_plugin_freetag.php
+++ b/serendipity_event_freetag/serendipity_plugin_freetag.php
@@ -32,7 +32,7 @@ class serendipity_plugin_freetag extends serendipity_plugin
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '3.01');
+ $propbag->add('version', '3.02');
$propbag->add('groups', array('FRONTEND_ENTRY_RELATED'));
$propbag->add('configuration', array('title', 'show_xml','xml_image', 'show_newline', 'taglink', 'scale_tag', 'max_tags', 'min_percent', 'max_percent', 'use_flash', 'flash_tag_color', 'flash_bg_trans', 'flash_bg_color', 'flash_width', 'flash_speed', 'treshold_tag_count', 'order_by', 'template'));
$this->dependencies = array('serendipity_event_freetag' => 'keep');
@@ -222,7 +222,8 @@ class serendipity_plugin_freetag extends serendipity_plugin
serendipity_db_bool($this->get_config('use_flash')),
serendipity_db_bool($this->get_config('flash_bg_trans', true)),
$this->get_config('flash_tag_color', 'ff6600'), $this->get_config('flash_bg_color', 'ffffff'),
- $this->get_config('flash_width', 190), $this->get_config('flash_speed', 100));
+ $this->get_config('flash_width', 190), $this->get_config('flash_speed', 100),
+ $this->get_config('taglink'), $this->get_config('template'), $this->get_config('xml_image','img/xml.gif'));
}
function cleanup() {
diff --git a/serendipity_event_galleryimage/serendipity_event_galleryimage.php b/serendipity_event_galleryimage/serendipity_event_galleryimage.php
index cd5bdea6..73596e79 100644
--- a/serendipity_event_galleryimage/serendipity_event_galleryimage.php
+++ b/serendipity_event_galleryimage/serendipity_event_galleryimage.php
@@ -66,7 +66,7 @@ class serendipity_event_galleryimage extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_GALLERYIMAGE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rob Antonishen, Alexander Mieland');
- $propbag->add('version', '1.10');
+ $propbag->add('version', '1.11');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -185,7 +185,7 @@ class serendipity_event_galleryimage 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);
}
@@ -288,7 +288,7 @@ class serendipity_event_galleryimage extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_geotag/plugin_version.inc.php b/serendipity_event_geotag/plugin_version.inc.php
index 0cb99cad..13af78e5 100644
--- a/serendipity_event_geotag/plugin_version.inc.php
+++ b/serendipity_event_geotag/plugin_version.inc.php
@@ -1,5 +1,5 @@
title;
}
- function event_hook($event, &$bag, &$eventData, &$addData = null) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_geourl/serendipity_event_geourl.php b/serendipity_event_geourl/serendipity_event_geourl.php
index 81554537..77d4c2e0 100644
--- a/serendipity_event_geourl/serendipity_event_geourl.php
+++ b/serendipity_event_geourl/serendipity_event_geourl.php
@@ -32,7 +32,7 @@ class serendipity_event_geourl extends serendipity_event {
$propbag->add('event_hooks', array('frontend_header' => true));
$propbag->add('configuration', array('lat', 'long'));
$propbag->add('description', PLUGIN_EVENT_GEOURL_DESC);
- $propbag->add('version', '1.3');
+ $propbag->add('version', '1.4');
$propbag->add('groups', array('BACKEND_METAINFORMATION'));
}
@@ -60,7 +60,7 @@ class serendipity_event_geourl extends serendipity_event {
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_geshi/serendipity_event_geshi.php b/serendipity_event_geshi/serendipity_event_geshi.php
index 27f93b94..f9a9748b 100644
--- a/serendipity_event_geshi/serendipity_event_geshi.php
+++ b/serendipity_event_geshi/serendipity_event_geshi.php
@@ -80,7 +80,7 @@ class serendipity_event_geshi extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '0.8');
+ $propbag->add('version', '0.9');
$propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
$propbag->add('groups', array('MARKUP'));
@@ -146,7 +146,7 @@ class serendipity_event_geshi extends serendipity_event
return $input;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_glossary/serendipity_event_glossary.php b/serendipity_event_glossary/serendipity_event_glossary.php
index a4d6e20d..6750321b 100644
--- a/serendipity_event_glossary/serendipity_event_glossary.php
+++ b/serendipity_event_glossary/serendipity_event_glossary.php
@@ -34,7 +34,7 @@ class serendipity_event_glossary extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_GLOSSARY_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rob Antonishen');
- $propbag->add('version', '1.6');
+ $propbag->add('version', '1.7');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -78,7 +78,7 @@ class serendipity_event_glossary 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);
}
@@ -136,7 +136,7 @@ class serendipity_event_glossary extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_google_analytics/serendipity_event_google_analytics.php b/serendipity_event_google_analytics/serendipity_event_google_analytics.php
index 790307a9..af002f43 100644
--- a/serendipity_event_google_analytics/serendipity_event_google_analytics.php
+++ b/serendipity_event_google_analytics/serendipity_event_google_analytics.php
@@ -21,7 +21,7 @@ class serendipity_event_google_analytics extends serendipity_event {
$propbag->add ('description', PLUGIN_EVENT_GOOGLE_ANALYTICS_DESC);
$propbag->add ('stackable', false);
$propbag->add ('author', 'kleinerChemiker');
- $propbag->add ('version', '1.2.9');
+ $propbag->add ('version', '1.3.0');
$propbag->add ('requirements', array ('serendipity' => '0.8', 'smarty' => '2.6.7', 'php' => '4.1.0' ));
$propbag->add ('groups', array ('STATISTICS' ));
$propbag->add ('cachable_events', array ('frontend_display' => true ));
@@ -120,8 +120,8 @@ class serendipity_event_google_analytics extends serendipity_event {
serendipity_plugin_api::hook_event ('backend_cache_entries', $this->title);
}
- function uninstall() {
- serendipity_plugin_api::hook_event ('backend_cache_purge', $this->title);
+ function uninstall(&$propbag) {
+ serendipity_plugin_api::hook_event ('backend_cache_purge', $this->title);
serendipity_plugin_api::hook_event ('backend_cache_entries', $this->title);
}
diff --git a/serendipity_event_gravatar/serendipity_event_gravatar.php b/serendipity_event_gravatar/serendipity_event_gravatar.php
index 12684276..e63fa09c 100755
--- a/serendipity_event_gravatar/serendipity_event_gravatar.php
+++ b/serendipity_event_gravatar/serendipity_event_gravatar.php
@@ -14,7 +14,7 @@ if (file_exists($probelang)) {
include dirname(__FILE__) . '/lang_en.inc.php';
// Actual version of this plugin
-@define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.57');
+@define('PLUGIN_EVENT_GRAVATAR_VERSION', '1.58');
// Defines the maximum available method slots in the configuration.
@define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6);
@@ -250,7 +250,8 @@ class serendipity_event_gravatar extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null)
+ {
global $serendipity;
static $cache = null;
static $method = null;
diff --git a/serendipity_event_guestbook/serendipity_event_guestbook.php b/serendipity_event_guestbook/serendipity_event_guestbook.php
index 30b336d2..8c8ae6cb 100644
--- a/serendipity_event_guestbook/serendipity_event_guestbook.php
+++ b/serendipity_event_guestbook/serendipity_event_guestbook.php
@@ -57,7 +57,7 @@ class serendipity_event_guestbook extends serendipity_event {
'dateformat'
));
$propbag->add('author', 'Ian (Timbalu)');
- $propbag->add('version', '3.29');
+ $propbag->add('version', '3.30');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
@@ -137,7 +137,7 @@ class serendipity_event_guestbook extends serendipity_event {
}
/* event hook::guestbook table uninstall */
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
if(isset($serendipity['guestbookdroptable']) === true) {
diff --git a/serendipity_event_guestbook/serendipity_plugin_guestbook.php b/serendipity_event_guestbook/serendipity_plugin_guestbook.php
index 5aa812e3..1f8d0df1 100644
--- a/serendipity_event_guestbook/serendipity_plugin_guestbook.php
+++ b/serendipity_event_guestbook/serendipity_plugin_guestbook.php
@@ -26,7 +26,7 @@ class serendipity_plugin_guestbook extends serendipity_plugin {
$propbag->add('description', PLUGIN_GUESTSIDE_BLAHBLAH);
$propbag->add('stackable', false);
$propbag->add('author', 'Jaap Boerma ( j@webbict.com ), Tadashi Jokagi , Ian (Timbalu)');
- $propbag->add('version', '1.19');
+ $propbag->add('version', '1.20');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
diff --git a/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php b/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php
index 0d0b0cb6..f872e430 100644
--- a/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php
+++ b/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php
@@ -25,7 +25,7 @@ class serendipity_event_htmlvalidator extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.3');
+ $propbag->add('version', '1.4');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -125,7 +125,7 @@ class serendipity_event_htmlvalidator 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');
diff --git a/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php b/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php
index c0eec05c..8fea56b6 100644
--- a/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php
+++ b/serendipity_event_imageselectorplus/serendipity_event_imageselectorplus.php
@@ -35,7 +35,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_IMAGESELECTORPLUS_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Vladimir Ajgl, Adam Charnock');
- $propbag->add('version', '0.30');
+ $propbag->add('version', '0.31');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -144,7 +144,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
}
// to recash all entries after uninstalling the plugin
- 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);
}
@@ -245,7 +245,7 @@ class serendipity_event_imageselectorplus extends serendipity_event
serendipity_makeThumbnail(basename($target), $dirname, $newsizes, $serendipity['thumbSuffix']);
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_includeentry/serendipity_event_includeentry.php b/serendipity_event_includeentry/serendipity_event_includeentry.php
index a987cb74..57576c1e 100644
--- a/serendipity_event_includeentry/serendipity_event_includeentry.php
+++ b/serendipity_event_includeentry/serendipity_event_includeentry.php
@@ -38,7 +38,7 @@ class serendipity_event_includeentry extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_INCLUDEENTRY_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '2.11');
+ $propbag->add('version', '2.12');
$propbag->add('scrambles_true_content', true);
$propbag->add('requirements', array(
'serendipity' => '0.8',
@@ -601,7 +601,7 @@ class serendipity_event_includeentry extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $check = null;
static $cache = array();
diff --git a/serendipity_event_jquery/serendipity_event_jquery.php b/serendipity_event_jquery/serendipity_event_jquery.php
index 04a2b004..bf445485 100644
--- a/serendipity_event_jquery/serendipity_event_jquery.php
+++ b/serendipity_event_jquery/serendipity_event_jquery.php
@@ -23,7 +23,7 @@ class serendipity_event_jquery extends serendipity_event {
$propbag->add('description', EVENT_JQUERY_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
- $propbag->add('version', '1.10');
+ $propbag->add('version', '1.11');
$propbag->add('event_hooks', array('frontend_header' => true,
'backend_header' => true,
'backend_plugins_new_instance' => true
@@ -40,7 +40,7 @@ class serendipity_event_jquery extends serendipity_event {
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_kubrickheader/serendipity_event_kubrickheader.php b/serendipity_event_kubrickheader/serendipity_event_kubrickheader.php
index 3d48e1aa..dde0b59e 100644
--- a/serendipity_event_kubrickheader/serendipity_event_kubrickheader.php
+++ b/serendipity_event_kubrickheader/serendipity_event_kubrickheader.php
@@ -23,8 +23,8 @@ class serendipity_event_kubrickheader extends serendipity_event {
$propbag->add('name', PLUGIN_EVENT_KUBRICKHEADER_NAME);
$propbag->add('description', PLUGIN_EVENT_KUBRICKHEADER_DESC);
$propbag->add('stackable', false);
- $propbag->add('author', 'Garvin Hicking extended by Sebastian Mayeres and Jude Anthony');
- $propbag->add('version', '1.4');
+ $propbag->add('author', 'Garvin Hicking, Sebastian Mayeres, Jude Anthony');
+ $propbag->add('version', '1.5');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -92,7 +92,7 @@ class serendipity_event_kubrickheader extends serendipity_event {
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_lightbox/serendipity_event_lightbox.php b/serendipity_event_lightbox/serendipity_event_lightbox.php
index 03a5e94e..02a01def 100644
--- a/serendipity_event_lightbox/serendipity_event_lightbox.php
+++ b/serendipity_event_lightbox/serendipity_event_lightbox.php
@@ -29,7 +29,7 @@ class serendipity_event_lightbox extends serendipity_event {
$propbag->add('name', PLUGIN_EVENT_LIGHTBOX_NAME);
$propbag->add('description', PLUGIN_EVENT_LIGHTBOX_DESC);
$propbag->add('author', 'Thomas Nesges, Andy Hopkins, Lokesh Dhakar, Cody Lindley, Stephan Manske, Grischa Brockhaus');
- $propbag->add('version', '1.9.5');
+ $propbag->add('version', '1.9.6');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -130,7 +130,7 @@ class serendipity_event_lightbox extends serendipity_event {
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $regex = null;
static $sub = null;
@@ -299,7 +299,7 @@ class serendipity_event_lightbox 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);
}
diff --git a/serendipity_event_linklist/serendipity_event_linklist.php b/serendipity_event_linklist/serendipity_event_linklist.php
index ff657cac..b6ab17e3 100644
--- a/serendipity_event_linklist/serendipity_event_linklist.php
+++ b/serendipity_event_linklist/serendipity_event_linklist.php
@@ -30,7 +30,7 @@ class serendipity_event_linklist extends serendipity_event {
'external_plugin' => true
));
$propbag->add('author', 'Matthew Groeninger, Omid Mottaghi Rad');
- $propbag->add('version', '1.98');
+ $propbag->add('version', '1.99');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -439,7 +439,7 @@ class serendipity_event_linklist extends serendipity_event {
$this->set_config('category','custom');
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
// Drop table
$q = "DROP TABLE ".$serendipity['dbPrefix']."links";
diff --git a/serendipity_event_livecomment/serendipity_event_livecomment.php b/serendipity_event_livecomment/serendipity_event_livecomment.php
index 9862d397..a0aedfaa 100644
--- a/serendipity_event_livecomment/serendipity_event_livecomment.php
+++ b/serendipity_event_livecomment/serendipity_event_livecomment.php
@@ -29,7 +29,7 @@ class serendipity_event_livecomment extends serendipity_event
'serendipity' => '1.0',
'php' => '4.1.0'
));
- $propbag->add('version', '2.5.4');
+ $propbag->add('version', '2.5.5');
$propbag->add('event_hooks', array(
'frontend_footer' => true,
'external_plugin' => true,
@@ -138,7 +138,7 @@ class serendipity_event_livecomment extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $variant = null;
diff --git a/serendipity_event_ljupdate/serendipity_event_ljupdate.php b/serendipity_event_ljupdate/serendipity_event_ljupdate.php
index 7381ce75..19c17c66 100644
--- a/serendipity_event_ljupdate/serendipity_event_ljupdate.php
+++ b/serendipity_event_ljupdate/serendipity_event_ljupdate.php
@@ -26,7 +26,7 @@ class serendipity_event_ljupdate extends serendipity_event
'php' => '4.1.0'
));
$propbag->add('author', 'Kaustubh Srikanth, Ivan Makhonin');
- $propbag->add('version', '1.12');
+ $propbag->add('version', '1.13');
$propbag->add('event_hooks', array(
@@ -256,7 +256,7 @@ class serendipity_event_ljupdate extends serendipity_event
echo "Updating finished.
\n";
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_loginform/serendipity_event_loginform.php b/serendipity_event_loginform/serendipity_event_loginform.php
index ea206ab5..c095f451 100644
--- a/serendipity_event_loginform/serendipity_event_loginform.php
+++ b/serendipity_event_loginform/serendipity_event_loginform.php
@@ -23,7 +23,7 @@ class serendipity_event_loginform extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_LOGINFORM_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.03');
+ $propbag->add('version', '1.04');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
@@ -60,7 +60,7 @@ class serendipity_event_loginform extends serendipity_event
$title = PLUGIN_EVENT_LOGINFORM_NAME;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_mailentry/serendipity_event_mailentry.php b/serendipity_event_mailentry/serendipity_event_mailentry.php
index 50b7a5a8..8f0babed 100644
--- a/serendipity_event_mailentry/serendipity_event_mailentry.php
+++ b/serendipity_event_mailentry/serendipity_event_mailentry.php
@@ -19,7 +19,7 @@ class serendipity_event_mailentry extends serendipity_event {
$propbag->add('name', PLUGIN_MAILENTRY_NAME);
$propbag->add('description', PLUGIN_MAILENTRY_DESC);
$propbag->add('configuration', array('title'));
- $propbag->add('version', '1.22');
+ $propbag->add('version', '1.23');
$propbag->add('event_hooks',
array('frontend_display:html:per_entry' => true));
$propbag->add('groups', array('FRONTEND_ENTRY_RELATED'));
@@ -50,7 +50,7 @@ class serendipity_event_mailentry extends serendipity_event {
return str_replace(array("\n", "\r", "\t", "\0"), array('', '', '', ''), $str);
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
switch ($event) {
diff --git a/serendipity_event_markdown/serendipity_event_markdown.php b/serendipity_event_markdown/serendipity_event_markdown.php
index b0ef8a51..61e4425d 100644
--- a/serendipity_event_markdown/serendipity_event_markdown.php
+++ b/serendipity_event_markdown/serendipity_event_markdown.php
@@ -30,7 +30,7 @@ class serendipity_event_markdown extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '1.15');
+ $propbag->add('version', '1.16');
$propbag->add('cachable_events', array('frontend_display' => true));
$propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
$propbag->add('groups', array('MARKUP'));
@@ -67,7 +67,7 @@ class serendipity_event_markdown 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_markdown extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
if($this->get_config('MARKDOWN_EXTRA', false)) {
diff --git a/serendipity_event_mimetex/serendipity_event_mimetex.php b/serendipity_event_mimetex/serendipity_event_mimetex.php
index ef3c4710..418835d1 100644
--- a/serendipity_event_mimetex/serendipity_event_mimetex.php
+++ b/serendipity_event_mimetex/serendipity_event_mimetex.php
@@ -24,7 +24,7 @@ class serendipity_event_mimetex extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_MIMETEX_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Matthew Groeninger');
- $propbag->add('version', '1.2');
+ $propbag->add('version', '1.3');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -170,7 +170,7 @@ class serendipity_event_mimetex 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');
diff --git a/serendipity_event_mobile_output/serendipity_event_mobile_output.php b/serendipity_event_mobile_output/serendipity_event_mobile_output.php
index 748661d1..23d5bf14 100644
--- a/serendipity_event_mobile_output/serendipity_event_mobile_output.php
+++ b/serendipity_event_mobile_output/serendipity_event_mobile_output.php
@@ -14,7 +14,7 @@ TODO:
if (IN_serendipity !== true) {
die ("Don't hack!");
}
-@define('PLUGIN_EVENT_MOBILE_VERSION','1.01');
+@define('PLUGIN_EVENT_MOBILE_VERSION','1.02');
@define('PLUGIN_EVENT_MOBILE_AUTHORS','Pelle Boese, Grischa Brockhaus');
@define('PLUGIN_EVENT_MOBILE_TPL_IPHONE','iphone.app');
@@ -81,7 +81,7 @@ class serendipity_event_mobile_output extends serendipity_event
}
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
serendipity_plugin_api::hook_event('backend_cache_purge', $this->title);
serendipity_plugin_api::hook_event('backend_cache_entries', $this->title);
diff --git a/serendipity_event_oembed/serendipity_event_oembed.php b/serendipity_event_oembed/serendipity_event_oembed.php
index a1440860..328153a7 100644
--- a/serendipity_event_oembed/serendipity_event_oembed.php
+++ b/serendipity_event_oembed/serendipity_event_oembed.php
@@ -30,7 +30,7 @@ class serendipity_event_oembed extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_OEMBED_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Grischa Brockhaus');
- $propbag->add('version', '1.07');
+ $propbag->add('version', '1.08');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -103,7 +103,7 @@ class serendipity_event_oembed extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $simplePatterns = null;
diff --git a/serendipity_event_openid/common.inc.php b/serendipity_event_openid/common.inc.php
index 26fa869e..38b2a4cd 100644
--- a/serendipity_event_openid/common.inc.php
+++ b/serendipity_event_openid/common.inc.php
@@ -54,7 +54,7 @@ class serendipity_common_openid {
exit;
}
- function reauth_openid() {
+ static function reauth_openid() {
global $serendipity;
if (isset($_SESSION['serendipityOpenID']) && $_SESSION['serendipityOpenID']) {
$serendipity['serendipityUser'] = $_SESSION['serendipityUser'];
diff --git a/serendipity_event_openid/serendipity_event_openid.php b/serendipity_event_openid/serendipity_event_openid.php
index ba9f7d16..bd178c62 100644
--- a/serendipity_event_openid/serendipity_event_openid.php
+++ b/serendipity_event_openid/serendipity_event_openid.php
@@ -13,7 +13,7 @@ class serendipity_event_openid extends serendipity_event
$propbag->add('description', PLUGIN_OPENID_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Grischa Brockhaus, Rob Richards');
- $propbag->add('version', '1.0');
+ $propbag->add('version', '1.1');
$propbag->add('requirements', array(
'serendipity' => '1.2',
'smarty' => '2.6.7',
diff --git a/serendipity_event_phoneblogz/serendipity_event_phoneblogz.php b/serendipity_event_phoneblogz/serendipity_event_phoneblogz.php
index c9a9c810..8e0ddb32 100755
--- a/serendipity_event_phoneblogz/serendipity_event_phoneblogz.php
+++ b/serendipity_event_phoneblogz/serendipity_event_phoneblogz.php
@@ -25,7 +25,7 @@ class serendipity_event_phoneblogz extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_PHONEBLOGZ_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, phoneblogz.com');
- $propbag->add('version', '0.7');
+ $propbag->add('version', '0.8');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -379,7 +379,7 @@ class serendipity_event_phoneblogz extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_photoblog/serendipity_event_photoblog.php b/serendipity_event_photoblog/serendipity_event_photoblog.php
index 9f113c7d..a91fde0b 100644
--- a/serendipity_event_photoblog/serendipity_event_photoblog.php
+++ b/serendipity_event_photoblog/serendipity_event_photoblog.php
@@ -11,7 +11,7 @@ if (file_exists($probelang)) {
include $probelang;
}
-@define('PLUGIN_EVENT_PHOTOBLOG_VERSION', '1.5');
+@define('PLUGIN_EVENT_PHOTOBLOG_VERSION', '1.6');
include dirname(__FILE__) . '/lang_en.inc.php';
@@ -240,7 +240,7 @@ class serendipity_event_photoblog extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_phpopentracker/serendipity_event_phpopentracker.php b/serendipity_event_phpopentracker/serendipity_event_phpopentracker.php
index 79b57d11..043e3477 100644
--- a/serendipity_event_phpopentracker/serendipity_event_phpopentracker.php
+++ b/serendipity_event_phpopentracker/serendipity_event_phpopentracker.php
@@ -69,7 +69,7 @@ class serendipity_event_phpopentracker extends serendipity_event {
$propbag->add('description', S9YPOT_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rene Schmidt');
- $propbag->add('version', '1.6');
+ $propbag->add('version', '1.7');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -114,7 +114,7 @@ class serendipity_event_phpopentracker extends serendipity_event {
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_picasa/serendipity_event_picasa.php b/serendipity_event_picasa/serendipity_event_picasa.php
index 978eb84f..a31ff096 100644
--- a/serendipity_event_picasa/serendipity_event_picasa.php
+++ b/serendipity_event_picasa/serendipity_event_picasa.php
@@ -256,7 +256,7 @@ class serendipity_event_picasa extends serendipity_event {
));
$propbag->add('stackable', false);
$propbag->add('author', 'Thomas Nesges, Greg Greenway');
- $propbag->add('version', '1.13');
+ $propbag->add('version', '1.14');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -362,7 +362,7 @@ class serendipity_event_picasa extends serendipity_event {
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_podcast/serendipity_event_podcast.php b/serendipity_event_podcast/serendipity_event_podcast.php
index a56b29de..152c65f3 100644
--- a/serendipity_event_podcast/serendipity_event_podcast.php
+++ b/serendipity_event_podcast/serendipity_event_podcast.php
@@ -14,7 +14,7 @@ if (file_exists($probelang)) {
include_once dirname(__FILE__) . '/lang_en.inc.php';
include_once dirname(__FILE__) . '/podcast_player.php';
-@define("SERENDIPITY_EVENT_PODCAST_VERSION", "1.35");
+@define("SERENDIPITY_EVENT_PODCAST_VERSION", "1.36");
class serendipity_event_podcast extends serendipity_event {
/**
@@ -422,7 +422,7 @@ class serendipity_event_podcast extends serendipity_event{
/**
@access public
*/
- function event_hook($event, &$bag, &$eventData, &$addData){
+ function event_hook($event, &$bag, &$eventData, $addData = null){
global $serendipity;
static $use_player = null;
static $firstmedia_only = null;
diff --git a/serendipity_event_popfetcher/serendipity_event_popfetcher.php b/serendipity_event_popfetcher/serendipity_event_popfetcher.php
index b85cd979..46a4419e 100644
--- a/serendipity_event_popfetcher/serendipity_event_popfetcher.php
+++ b/serendipity_event_popfetcher/serendipity_event_popfetcher.php
@@ -12,7 +12,7 @@ require_once('tmobile.php');
require_once('o2.php');
// Default values
-define('POPFETCHER_VERSION', '1.42'); // This version of Popfetcher
+define('POPFETCHER_VERSION', '1.43'); // This version of Popfetcher
define('DEFAULT_ADMINMENU', 'true'); // True if run as sidebar plugin. False if external plugin.
define('DEFAULT_HIDENAME', 'popfetcher'); // User should set this to something unguessable
define('DEFAULT_MAILSERVER', '');
@@ -1527,7 +1527,7 @@ class serendipity_event_popfetcher extends serendipity_event
echo '
';
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_prettify/serendipity_event_prettify.php b/serendipity_event_prettify/serendipity_event_prettify.php
index fe9090c3..1ac1fc63 100644
--- a/serendipity_event_prettify/serendipity_event_prettify.php
+++ b/serendipity_event_prettify/serendipity_event_prettify.php
@@ -23,7 +23,7 @@ class serendipity_event_prettify extends serendipity_event
$propbag->add('description', PLUGIN_PRETTIFY_DESC);
$propbag->add('stackable', false);
$propbag->add('author', PLUGIN_PRETTIFY_AUTH);
- $propbag->add('version', '1.6.0');
+ $propbag->add('version', '1.6.1');
$propbag->add('requirements', array('serendipity' => '1.0',
'smarty' => '2.6.7',
'php' => '4.1.0'
@@ -144,7 +144,7 @@ class serendipity_event_prettify extends serendipity_event
return $s;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_randomblogdescription/serendipity_event_randomblogdescription.php b/serendipity_event_randomblogdescription/serendipity_event_randomblogdescription.php
index 1a101a01..2f6604be 100644
--- a/serendipity_event_randomblogdescription/serendipity_event_randomblogdescription.php
+++ b/serendipity_event_randomblogdescription/serendipity_event_randomblogdescription.php
@@ -26,7 +26,7 @@ class serendipity_event_randomblogdescription extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_RANDOMBLOGDESCRIPTION_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Florian Anderiasch');
- $propbag->add('version', '0.5');
+ $propbag->add('version', '0.6');
$propbag->add('configuration', array('enabled', 'blogdescription'));
$propbag->add('requirements', array(
'serendipity' => '0.8',
@@ -67,7 +67,7 @@ class serendipity_event_randomblogdescription 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');
diff --git a/serendipity_event_realtimecomments/serendipity_event_realtimecomments.php b/serendipity_event_realtimecomments/serendipity_event_realtimecomments.php
index 380f77a2..2ae53e85 100644
--- a/serendipity_event_realtimecomments/serendipity_event_realtimecomments.php
+++ b/serendipity_event_realtimecomments/serendipity_event_realtimecomments.php
@@ -24,7 +24,7 @@ class serendipity_event_realtimecomments extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_REALTIMECOMMENTS_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
- $propbag->add('version', '0.1.2');
+ $propbag->add('version', '0.1.3');
$propbag->add('requirements', array(
'serendipity' => '0.8'
));
@@ -76,7 +76,7 @@ class serendipity_event_realtimecomments extends serendipity_event {
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_regexpmarkup/serendipity_event_regexpmarkup.php b/serendipity_event_regexpmarkup/serendipity_event_regexpmarkup.php
index 66ecbd4a..687938f3 100644
--- a/serendipity_event_regexpmarkup/serendipity_event_regexpmarkup.php
+++ b/serendipity_event_regexpmarkup/serendipity_event_regexpmarkup.php
@@ -25,7 +25,7 @@ class serendipity_event_regexpmarkup extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_REGEXPMARKUP_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rob Antonishen');
- $propbag->add('version', '0.7');
+ $propbag->add('version', '0.8');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -66,7 +66,7 @@ class serendipity_event_regexpmarkup 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);
}
@@ -84,7 +84,7 @@ class serendipity_event_regexpmarkup extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php b/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php
index ad1fc3a2..d7f4549d 100644
--- a/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php
+++ b/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php
@@ -45,7 +45,7 @@ class serendipity_event_smartymarkup extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_SMARTYMARKUP_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.10');
+ $propbag->add('version', '1.11');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -93,7 +93,7 @@ class serendipity_event_smartymarkup 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);
}
diff --git a/serendipity_event_snapshotlinks/serendipity_event_snapshotlinks.php b/serendipity_event_snapshotlinks/serendipity_event_snapshotlinks.php
index 1403d7f9..a6972082 100644
--- a/serendipity_event_snapshotlinks/serendipity_event_snapshotlinks.php
+++ b/serendipity_event_snapshotlinks/serendipity_event_snapshotlinks.php
@@ -27,7 +27,7 @@ class serendipity_event_snapshotlinks extends serendipity_plugin
$propbag->add('name', PLUGIN_SNAPSHOTLINKS_NAME);
$propbag->add('stackable', false);
$propbag->add('author', 'Grischa Brockhaus');
- $propbag->add('version', '1.02');
+ $propbag->add('version', '1.03');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -225,7 +225,7 @@ class serendipity_event_snapshotlinks extends serendipity_plugin
$title = PLUGIN_SNAPSHOTLINKS_NAME;
}
- function event_hook($event, &$bag, &$eventData, &$addData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $state, $locked;
diff --git a/serendipity_event_startcat/serendipity_event_startcat.php b/serendipity_event_startcat/serendipity_event_startcat.php
index c77f31b7..aa9ac745 100644
--- a/serendipity_event_startcat/serendipity_event_startcat.php
+++ b/serendipity_event_startcat/serendipity_event_startcat.php
@@ -25,7 +25,7 @@ class serendipity_event_startcat extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_STARTCAT_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Stefan Willoughby, Garvin Hicking');
- $propbag->add('version', '1.9');
+ $propbag->add('version', '1.10');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -109,7 +109,7 @@ class serendipity_event_startcat extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_template_editor/serendipity_event_template_editor.php b/serendipity_event_template_editor/serendipity_event_template_editor.php
index 973cac53..885c400e 100644
--- a/serendipity_event_template_editor/serendipity_event_template_editor.php
+++ b/serendipity_event_template_editor/serendipity_event_template_editor.php
@@ -25,7 +25,7 @@ class serendipity_event_template_editor extends serendipity_event {
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
$propbag->add('license', 'GPL');
- $propbag->add('version', '0.4');
+ $propbag->add('version', '0.5');
$propbag->add('requirements', array(
'serendipity' => '0.8'
));
@@ -66,7 +66,7 @@ class serendipity_event_template_editor extends serendipity_event {
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_tinymce/serendipity_event_tinymce.php b/serendipity_event_tinymce/serendipity_event_tinymce.php
index 1d7cd589..0c37e48a 100644
--- a/serendipity_event_tinymce/serendipity_event_tinymce.php
+++ b/serendipity_event_tinymce/serendipity_event_tinymce.php
@@ -30,7 +30,7 @@ class serendipity_event_tinymce extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_TINYMCE_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Grischa Brockhaus');
- $propbag->add('version', '1.10');
+ $propbag->add('version', '1.11');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -149,7 +149,7 @@ class serendipity_event_tinymce 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');
diff --git a/serendipity_event_todolist/serendipity_event_todolist.php b/serendipity_event_todolist/serendipity_event_todolist.php
index eb9c645b..47599bf4 100644
--- a/serendipity_event_todolist/serendipity_event_todolist.php
+++ b/serendipity_event_todolist/serendipity_event_todolist.php
@@ -24,7 +24,7 @@ if (file_exists($probelang)) {
include dirname(__FILE__) . '/lang_en.inc.php';
-@define('PLUGIN_EVENT_TODOLIST_DBVERSION', '1.11');
+@define('PLUGIN_EVENT_TODOLIST_DBVERSION', '1.12');
class serendipity_event_todolist extends serendipity_event {
@@ -1214,7 +1214,7 @@ class serendipity_event_todolist extends serendipity_event {
$this->set_config('catbd','done');
}
- function uninstall() {
+ function uninstall(&$propbag) {
global $serendipity;
// Don't Drop table to avoid losing data.
// $q = "DROP TABLE ".$serendipity['dbPrefix']."percentagedone";
diff --git a/serendipity_event_tooltips/serendipity_event_tooltips.php b/serendipity_event_tooltips/serendipity_event_tooltips.php
index 29b52ab8..c1cf4c34 100644
--- a/serendipity_event_tooltips/serendipity_event_tooltips.php
+++ b/serendipity_event_tooltips/serendipity_event_tooltips.php
@@ -25,7 +25,7 @@ class serendipity_event_tooltips extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_TOOLTIPS_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Enrico Stahn');
- $propbag->add('version', '1.4');
+ $propbag->add('version', '1.5');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -136,7 +136,7 @@ class serendipity_event_tooltips 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);
}
@@ -259,7 +259,7 @@ class serendipity_event_tooltips extends serendipity_event
return $element;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php b/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php
index ef3f2f36..121e66e4 100644
--- a/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php
+++ b/serendipity_event_typesetbuttons/serendipity_event_typesetbuttons.php
@@ -25,7 +25,7 @@ class serendipity_event_typesetbuttons extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_TYPESETBUTTONS_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Matthew Groeninger, Malte Diers');
- $propbag->add('version', '0.10');
+ $propbag->add('version', '0.11');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -290,7 +290,7 @@ class serendipity_event_typesetbuttons extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_typoquote/serendipity_event_typoquote.php b/serendipity_event_typoquote/serendipity_event_typoquote.php
index 8db982ed..0943e5e4 100755
--- a/serendipity_event_typoquote/serendipity_event_typoquote.php
+++ b/serendipity_event_typoquote/serendipity_event_typoquote.php
@@ -24,7 +24,7 @@ class serendipity_event_typoquote extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_QUOTES_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Jonathan Spalink and Matthew Groeninger');
- $propbag->add('version', '1.4');
+ $propbag->add('version', '1.5');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -67,7 +67,7 @@ class serendipity_event_typoquote 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);
}
@@ -101,7 +101,7 @@ class serendipity_event_typoquote extends serendipity_event
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php b/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php
index c1b3da4b..c4029d83 100644
--- a/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php
+++ b/serendipity_event_unstrip_tags/serendipity_event_unstrip_tags.php
@@ -24,7 +24,7 @@ class serendipity_event_unstrip_tags extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_UNSTRIP_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.02');
+ $propbag->add('version', '1.03');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
@@ -37,7 +37,7 @@ class serendipity_event_unstrip_tags extends serendipity_event
function generate_content(&$title) {
$title = $this->title;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_usergallery/serendipity_event_usergallery.php b/serendipity_event_usergallery/serendipity_event_usergallery.php
index dbe79c1b..a0c11d3b 100644
--- a/serendipity_event_usergallery/serendipity_event_usergallery.php
+++ b/serendipity_event_usergallery/serendipity_event_usergallery.php
@@ -24,7 +24,7 @@ class serendipity_event_usergallery extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_USERGALLERY_DESC);
$propbag->add('stackable', true);
$propbag->add('author', 'Arnan de Gans, Matthew Groeninger, and Stefan Willoughby');
- $propbag->add('version', '2.53');
+ $propbag->add('version', '2.54');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -380,7 +380,7 @@ class serendipity_event_usergallery extends serendipity_event
return $selector;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_wordwrap/serendipity_event_wordwrap.php b/serendipity_event_wordwrap/serendipity_event_wordwrap.php
index 578be7ab..d95f8365 100644
--- a/serendipity_event_wordwrap/serendipity_event_wordwrap.php
+++ b/serendipity_event_wordwrap/serendipity_event_wordwrap.php
@@ -25,7 +25,7 @@ class serendipity_event_wordwrap extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_WORDWRAP_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
- $propbag->add('version', '1.03');
+ $propbag->add('version', '1.04');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -68,7 +68,7 @@ class serendipity_event_wordwrap 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);
}
@@ -110,7 +110,7 @@ class serendipity_event_wordwrap extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_xinha/serendipity_event_xinha.php b/serendipity_event_xinha/serendipity_event_xinha.php
index c744b925..d4c082f8 100644
--- a/serendipity_event_xinha/serendipity_event_xinha.php
+++ b/serendipity_event_xinha/serendipity_event_xinha.php
@@ -29,7 +29,7 @@ class serendipity_event_xinha extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_XINHA_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Ziyad Saeed, Garvin Hicking');
- $propbag->add('version', '0.6');
+ $propbag->add('version', '0.7');
$propbag->add('requirements', array(
'serendipity' => '0.9',
'smarty' => '2.6.7',
@@ -91,7 +91,7 @@ class serendipity_event_xinha extends serendipity_event
return $o;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_xmlrpc/serendipity_event_xmlrpc.php b/serendipity_event_xmlrpc/serendipity_event_xmlrpc.php
index a9bf24c1..4ea8022a 100644
--- a/serendipity_event_xmlrpc/serendipity_event_xmlrpc.php
+++ b/serendipity_event_xmlrpc/serendipity_event_xmlrpc.php
@@ -25,7 +25,7 @@ class serendipity_event_xmlrpc extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_XMLRPC_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team');
- $propbag->add('version', '1.51');
+ $propbag->add('version', '1.52');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -190,7 +190,7 @@ class serendipity_event_xmlrpc extends serendipity_event
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity, $HTTP_RAW_POST_DATA;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_youtube/serendipity_event_youtube.php b/serendipity_event_youtube/serendipity_event_youtube.php
index 72cf8ab1..cf7a597e 100644
--- a/serendipity_event_youtube/serendipity_event_youtube.php
+++ b/serendipity_event_youtube/serendipity_event_youtube.php
@@ -30,7 +30,7 @@ class serendipity_event_youtube extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
- $propbag->add('version', '1.1');
+ $propbag->add('version', '1.2');
$propbag->add('event_hooks', array(
'backend_entry_toolbar_extended' => true,
'backend_entry_toolbar_body' => true,
@@ -97,7 +97,7 @@ class serendipity_event_youtube extends serendipity_event
}
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_event_yq/serendipity_event_yq.php b/serendipity_event_yq/serendipity_event_yq.php
index 43b9421f..e880bd00 100644
--- a/serendipity_event_yq/serendipity_event_yq.php
+++ b/serendipity_event_yq/serendipity_event_yq.php
@@ -28,7 +28,7 @@ class serendipity_event_yq extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_YQ_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rasmus Lerdorf');
- $propbag->add('version', '1.1');
+ $propbag->add('version', '1.2');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -66,7 +66,7 @@ class serendipity_event_yq extends serendipity_event {
return true;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity, $IE;
static $hookno = 0;
diff --git a/serendipity_plugin_flickr/serendipity_event_flickrcss.php b/serendipity_plugin_flickr/serendipity_event_flickrcss.php
index e8edb40c..065afa99 100644
--- a/serendipity_plugin_flickr/serendipity_event_flickrcss.php
+++ b/serendipity_plugin_flickr/serendipity_event_flickrcss.php
@@ -18,7 +18,7 @@ class serendipity_event_flickrcss extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_FLICKRCSS_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Michael Kaiser');
- $propbag->add('version', '1.04');
+ $propbag->add('version', '1.05');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.9',
@@ -41,7 +41,7 @@ class serendipity_event_flickrcss extends serendipity_event
$title = PLUGIN_EVENT_FLICKRCSS;
}
- function event_hook($event, &$bag, &$eventData) {
+ function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
diff --git a/serendipity_plugin_twitter/classes/Twitter.php b/serendipity_plugin_twitter/classes/Twitter.php
index dd992041..bab70d6d 100644
--- a/serendipity_plugin_twitter/classes/Twitter.php
+++ b/serendipity_plugin_twitter/classes/Twitter.php
@@ -466,7 +466,7 @@ class Twitter {
return $status;
}
- function create_status_ago_string($twitter_time_string){
+ static function create_status_ago_string($twitter_time_string){
// Some strtotime versions are not able to handle the long date string. So shorten it!
$datepart = explode(" ", $twitter_time_string);
diff --git a/serendipity_plugin_twitter/classes/TwitterPluginDbAccess.php b/serendipity_plugin_twitter/classes/TwitterPluginDbAccess.php
index 31203170..459bdb70 100644
--- a/serendipity_plugin_twitter/classes/TwitterPluginDbAccess.php
+++ b/serendipity_plugin_twitter/classes/TwitterPluginDbAccess.php
@@ -53,7 +53,7 @@ class TwitterPluginDbAccess {
}
}
- function load_short_urls( $article_url, $selected_services ) {
+ static function load_short_urls( $article_url, $selected_services ) {
global $serendipity;
$inservices = "'" . implode("','", $selected_services) . "'";
@@ -79,7 +79,7 @@ class TwitterPluginDbAccess {
}
}
- function save_short_urls( $article_url, $shorturls, $loaded_shorturls = array() ) {
+ static function save_short_urls( $article_url, $shorturls, $loaded_shorturls = array() ) {
global $serendipity;
// insert all new (not yet known) shorturls.
diff --git a/serendipity_plugin_twitter/classes/TwitterPluginFileAccess.php b/serendipity_plugin_twitter/classes/TwitterPluginFileAccess.php
index 309dbd42..eaadcebc 100644
--- a/serendipity_plugin_twitter/classes/TwitterPluginFileAccess.php
+++ b/serendipity_plugin_twitter/classes/TwitterPluginFileAccess.php
@@ -19,7 +19,7 @@ class TwitterPluginFileAccess {
}
}
- function get_permaplugin_path() {
+ static function get_permaplugin_path() {
global $serendipity;
// Get configured plugin path:
diff --git a/serendipity_plugin_twitter/plugin_version.inc.php b/serendipity_plugin_twitter/plugin_version.inc.php
index 21f623dd..c26e28db 100644
--- a/serendipity_plugin_twitter/plugin_version.inc.php
+++ b/serendipity_plugin_twitter/plugin_version.inc.php
@@ -1,4 +1,4 @@
get_config('toall_only', false));
$filter_all_user = serendipity_db_bool($this->get_config('filter_all_user', false));
- foreach ($xml as $key => $value) {
+ foreach ($xml as $key => $status) {
// Change encoding of update to Visitors language
if (LANG_CHARSET!='UTF-8' && function_exists("mb_convert_encoding")) {
$status->text = mb_convert_encoding($status->text, LANG_CHARSET, 'auto');
}
$showit = true;
- if ($filter_all_user && preg_match('/@/',$value->text)) $showit=false;
- else if ($toall_only && preg_match('/^@/',$value->text)) $showit=false;
+ if ($filter_all_user && preg_match('/@/',$status->text)) $showit=false;
+ else if ($toall_only && preg_match('/^@/',$status->text)) $showit=false;
if ($showit) {
- $str_output[] = '';
+ $str_output[] = '';
$odd_css = $odd_css=='odd'?'even':'odd';
$counter++;
}