qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

php5 static fix

Browse source
This commit is contained in:
Garvin Hicking 2013-05-10 11:16:54 +02:00
parent 9e21e2c30d
commit 9a05768ae7
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
serendipity_event_emoticonchooser/ChangeLog
View file

@ -1,3 +1,8 @@
2.1:
----
Fix for static calling of the plugin
2.0:
----
tweaked and added backend css

25
serendipity_event_emoticonchooser/serendipity_event_emoticonchooser.php
View file

@ -30,7 +30,7 @@ class serendipity_event_emoticonchooser extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
$propbag->add('version', '2.0');
$propbag->add('version', '2.1');
$propbag->add('event_hooks', array(
'backend_entry_toolbar_extended' => true,
'backend_entry_toolbar_body' => true,
@ -141,11 +141,28 @@ class serendipity_event_emoticonchooser extends serendipity_event
}
$i = 1;
$emoticons = serendipity_event_emoticate::getEmoticons();
// This plugin wants to access serendipity_event_emoticate. Its methods are non-static
// and it's not properly working with PHP5 to call. So to perform properly, let's take
// the actual plugin:
$plugins = serendipity_plugin_api::get_event_plugins();
$emoticate_plugin = null;
while(list($plugin, $plugin_data) = each($plugins)) {
if (strpos($plugin, 'serendipity_event_emoticate') !== FALSE) {
$emoticate_plugin =& $plugin_data['p'];
break;
}
}
if ($emoticate_plugin === null) {
return;
}
$emoticons = $emoticate_plugin->getEmoticons();
$unique = array();
foreach($emoticons as $key => $value) {
if (is_callable(array('serendipity_event_emoticate', 'humanReadableEmoticon'))) {
$key = serendipity_event_emoticate::humanReadableEmoticon($key);
if (is_callable(array($emoticate_plugin, 'humanReadableEmoticon'))) {
$key = $emoticate_plugin->humanReadableEmoticon($key);
}
$unique[$value] = $key;
}