Merge pull request #596 from MrPetovan/task/add-advancedcontentfilter-addon
[advancedcontentfilter] Fix various error messagespull/597/head
commit
d998331039
|
@ -118,6 +118,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
|
|||
));
|
||||
}
|
||||
|
||||
if ($rules) {
|
||||
foreach($rules as $rule) {
|
||||
try {
|
||||
$serializedParsedExpression = new ExpressionLanguage\SerializedParsedExpression(
|
||||
|
@ -135,6 +136,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -199,6 +201,7 @@ function advancedcontentfilter_content(App $a)
|
|||
} else {
|
||||
$t = get_markup_template('settings.tpl', 'addon/advancedcontentfilter/');
|
||||
return replace_macros($t, [
|
||||
'$current_theme' => $a->getCurrentTheme(),
|
||||
'$backtosettings' => L10n::t('Back to Addon Settings'),
|
||||
'$title' => L10n::t('Advanced Content Filter'),
|
||||
'$add_a_rule' => L10n::t('Add a Rule'),
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
{{if current_theme() == 'frio'}}
|
||||
{{if $current_theme == 'frio'}}
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="{{$close}}" @click="showModal = false"><span aria-hidden="true">×</span></button>
|
||||
{{/if}}
|
||||
<h3 v-if="rule.id">{{$edit_the_rule}} "{{ rule.name }}"</h3>
|
||||
|
|
Loading…
Reference in New Issue