/[drupal]/contributions/modules/geshifilter/geshifilter.conflicts.inc
ViewVC logotype

Diff of /contributions/modules/geshifilter/geshifilter.conflicts.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.5, Sat Jul 4 09:48:59 2009 UTC revision 1.6, Sun Jul 12 15:00:28 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: geshifilter.conflicts.inc,v 1.4 2008/07/21 17:44:23 soxofaan Exp $  // $Id: geshifilter.conflicts.inc,v 1.5 2009/07/04 09:48:59 soxofaan Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 81  function _geshifilter_htmlfilter_conflic Line 81  function _geshifilter_htmlfilter_conflic
81    // check tag escaping of html filter    // check tag escaping of html filter
82    if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_ESCAPE) {    if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_ESCAPE) {
83      $conflicts[] = array(      $conflicts[] = array(
84        'description' => t('%cfilter is configured to "%escape", which is likely to cause propblems with %geshifilter.',        'description' => t('%cfilter is configured to "%escape", which is likely to cause problems with %geshifilter.',
85          array('%cfilter' => $cfilter->name, '%geshifilter' => $geshifilter->name, '%escape' => t('Escape all tags'))),          array('%cfilter' => $cfilter->name, '%geshifilter' => $geshifilter->name, '%escape' => t('Escape all tags'))),
86        'solution' => l(t('Configure HTML filtering to "%strip"', array('%strip' => t('Strip disallowed tags'))), "admin/settings/filters/$format/configure", array('html' => TRUE)),        'solution' => l(t('Configure HTML filtering to "%strip"', array('%strip' => t('Strip disallowed tags'))), "admin/settings/filters/$format/configure", array('html' => TRUE)),
87      );      );

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

  ViewVC Help
Powered by ViewVC 1.1.2