Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20254/plugins/serendipity_event_emoticate
Modified Files:
Tag: branch_0_6
serendipity_event_emoticate.php
Log Message:
MFH:
* Upgrader kills the current session for possible changes inside session
data on upgrade
* Fixed wrong comparison operator - bug reported by tom, where nl2br plugin
has "reversed" logic.
This is because (true != 'false') evaluates to true. Plugin config did not
evaluate radio values correctly.
* Fixed textile plugin not enabled by default after adding it as a plugin
* Comments plugin now correctly wordwraps
* Couple of linebreak fixes (*sigh*)
PLEASE TEST THE PLUGIN-STUFF! Needs to be verified working for rc2...
Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- serendipity_event_emoticate.php 18 Mar 2004 12:09:04 -0000 1.3
+++ serendipity_event_emoticate.php 13 Apr 2004 10:01:13 -0000 1.3.4.1
@@ -21,7 +21,7 @@
function introspect(&$propbag)
{
global $serendipity;
-
+
$propbag->add('name', PLUGIN_EVENT_EMOTICATE_NAME);
$propbag->add('description', PLUGIN_EVENT_EMOTICATE_DESC);
$propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
@@ -74,7 +74,7 @@
function generate_content(&$title) {
$title = PLUGIN_EVENT_EMOTICATE_NAME;
}
-
+
function introspect_config_item($name, &$propbag)
{
@@ -87,7 +87,7 @@
function event_hook($event, &$bag, &$eventData) {
global $serendipity;
-
+
$hooks = &$bag->get('event_hooks');
if (isset($hooks[$event])) {
@@ -95,22 +95,22 @@
case 'frontend_display':
foreach ($this->markup_elements as $temp) {
- if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
+ if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
$element = $temp['element'];
-
+
foreach ($this->smiles as $key => $value) {
- $eventData[$element] = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m",
- "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" />$2",
+ $eventData[$element] = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m",
+ "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" />$2",
$eventData[$element]
);
}
- }
+ }
}
return true;
break;
-
+
case 'frontend_comment':
- if ($this->get_config(COMMENT) != 'false') {
+ if (serendipity_db_bool($this->get_config(COMMENT, true))) {
echo PLUGIN_EVENT_EMOTICATE_TRANSFORM . '<br />';
}
return true;
|
