1.7 compatibility

This commit is contained in:
Garvin Hicking 2012-10-18 10:01:35 +02:00
parent a0f5ea48d6
commit e1de798563
8 changed files with 19 additions and 12 deletions

View file

@ -1,3 +1,5 @@
Made event_hook() declaration the same as in s9y core
1.9:
----

View file

@ -60,7 +60,7 @@ class serendipity_event_flattr extends serendipity_event {
'add_to_feed',
));
$propbag->add('author', 'Garvin Hicking, Joachim Breitner', 'Matthias Gutjahr');
$propbag->add('version', '1.10');
$propbag->add('version', '1.11');
$propbag->add('requirements', array(
'serendipity' => '0.7',
'smarty' => '2.6.7',
@ -236,7 +236,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) {

View file

@ -1,5 +1,7 @@
# $Id$
Made event_hook() declaration the same as in s9y core
------------------------------------------------------------------------
Version 1.3 (brockhaus):

View file

@ -25,7 +25,7 @@ class serendipity_event_getid3 extends serendipity_plugin
$propbag->add('description', PLUGIN_GETID3_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Grischa Brockhaus');
$propbag->add('version', '1.3');
$propbag->add('version', '1.4');
$propbag->add('requirements', array(
'serendipity' => '1.1',
'smarty' => '2.6.7',
@ -88,7 +88,7 @@ class serendipity_event_getid3 extends serendipity_plugin
return true;
}
function event_hook($event, &$bag, &$eventData, $addData = array()) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
static $i = null;

View file

@ -1,3 +1,5 @@
Made event_hook() declaration the same as in s9y core
0.13:
Fixed misspell of $addData vs. $addlData

View file

@ -25,7 +25,7 @@ class serendipity_event_metadesc extends serendipity_event {
$propbag->add('description', PLUGIN_METADESC_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking, Judebert, Don Chambers');
$propbag->add('version', '0.13');
$propbag->add('version', '0.14');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'php' => '4.1.0'
@ -116,7 +116,7 @@ class serendipity_event_metadesc extends serendipity_event {
return $results;
}
function event_hook($event, &$bag, &$eventData, &$addlData) {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');
@ -128,7 +128,7 @@ class serendipity_event_metadesc extends serendipity_event {
// variables before the template is called for the HTML head.
// Only modify the title on single-entry pages
if ($addlData['view'] == 'entry') {
if ($addData['view'] == 'entry') {
// Get the properties for this entry
$myid = $serendipity['GET']['id'];
// Requires a database fetch, but the only other way
@ -305,17 +305,17 @@ class serendipity_event_metadesc extends serendipity_event {
break;
case 'frontend_entryproperties':
if (class_exists('serendipity_event_entryproperties') || !is_array($addlData)) {
if (class_exists('serendipity_event_entryproperties') || !is_array($addData)) {
// Fetching of properties is already done there, so this is just for poor users who don't have the entryproperties plugin enabled
return true;
}
$q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addlData)) . ") AND property LIKE '%meta_%'";
$q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ") AND property LIKE '%meta_%'";
$properties = serendipity_db_query($q);
if (!is_array($properties)) {
return true;
}
foreach($properties AS $idx => $row) {
$eventData[$addlData[$row['entryid']]]['properties'][$row['property']] = $row['value'];
$eventData[$addData[$row['entryid']]]['properties'][$row['property']] = $row['value'];
}
return true;
break;

View file

@ -0,0 +1 @@
Made event_hook() declaration the same as in s9y core

View file

@ -31,7 +31,7 @@ class serendipity_event_xsstrust extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
$propbag->add('version', '0.4');
$propbag->add('version', '0.5');
$propbag->add('event_hooks', array(
'frontend_display' => true,
'backend_media_check' => true));
@ -118,7 +118,7 @@ class serendipity_event_xsstrust extends serendipity_event
return serendipity_set_config_var($fname, $dbval);
}
function event_hook($event, &$bag, &$eventData, $addData = '') {
function event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity;
$hooks = &$bag->get('event_hooks');