1
0

check for config mismatch p_tags vs ISOBR

This commit is contained in:
Ian
2012-05-03 19:27:19 +02:00
parent a5e04542cb
commit 8522cc99a8
8 changed files with 16 additions and 9 deletions

@ -15,7 +15,7 @@ class serendipity_event_nl2br extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team');
$propbag->add('version', '2.14');
$propbag->add('version', '2.15');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@ -63,7 +63,14 @@ class serendipity_event_nl2br extends serendipity_event
if ( serendipity_db_bool($this->get_config('isobr')) === true && serendipity_db_bool($this->get_config('clean_tags')) === true ) {
$this->set_config('clean_tags', false);
echo '<div class="serendipityAdminMsgError"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
echo PLUGIN_EVENT_NL2BR_CONFIG_ERROR . '</div>';
echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'clean_tags', 'ISOBR') . '</div>';
return false;
}
/* check possible config mismatch setting */
if ( serendipity_db_bool($this->get_config('isobr')) === true && serendipity_db_bool($this->get_config('p_tags')) === true ) {
$this->set_config('p_tags', false);
echo '<div class="serendipityAdminMsgError"><img class="backend_attention" src="' . $serendipity['serendipityHTTPPath'] . 'templates/default/admin/img/admin_msg_note.png" alt="" />';
echo sprintf(PLUGIN_EVENT_NL2BR_CONFIG_ERROR, 'p_tags', 'ISOBR') . '</div>';
return false;
}
return true;