mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

automark nl2br disabled on wysiwyg usage

Browse Source 
References s9y/Serendipity#243
This commit is contained in:
Ian
2014-12-15 16:00:45 +01:00
parent c3d060c973
commit dc6d32bf68
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
View File

@@ -15,7 +15,7 @@ class serendipity_event_entryproperties extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.34');
$propbag->add('version', '1.35');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -418,7 +418,10 @@ class serendipity_event_entryproperties extends serendipity_event
} else {
$selected = false;
}
// automatically mark nl2br markup parser as disabled, when WYSIWYG is active
if (!$selected && $serendipity['wysiwyg'] && $plugin_data['p']->act_pluginPath == 'serendipity_event_nl2br') {
$selected = true;
}
echo '<option ' . ($selected ? 'selected="selected"' : '') . ' value="' . $plugin_data['p']->instance . '">' . serendipity_specialchars($plugin_data['p']->title) . '</option>' . "\n";
}
}