bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ctools, panels, date, diff

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2017-05-24 19:22:50 +02:00
parent 542ac42fca
commit 9acef9d37e
189 changed files with 2928 additions and 1797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sites/all/modules/contrib/content/diff/diff.tokens.inc
View File

@@ -38,13 +38,13 @@ function diff_tokens($type, $tokens, array $data = array(), array $options = arr
// Basic diff standard comparison information.
case 'diff':
case 'diff-markdown':
$revisons = node_revision_list($node);
if (count($revisons) == 1) {
$revisions = node_revision_list($node);
if (count($revisions) == 1) {
$replacements[$original] = t('(No previous revision available.)');
}
else {
module_load_include('inc', 'diff', 'diff.pages');
$old_vid = _diff_get_previous_vid($revisons, $node->vid);
$old_vid = _diff_get_previous_vid($revisions, $node->vid);
$state = $name == 'diff' ? 'raw' : 'raw_plain';
$build = diff_diffs_show($node, $old_vid, $node->vid, $state);
unset($build['diff_table']['#rows']['states']);
@@ -52,7 +52,10 @@ function diff_tokens($type, $tokens, array $data = array(), array $options = arr
unset($build['diff_preview']);
$output = drupal_render_children($build);
$replacements[$original] = $sanitize ? check_plain($output) : $output;
if ($sanitize) {
$output = filter_xss($output, array('a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'table', 'tr', 'th', 'td'));
}
$replacements[$original] = $output;
}
break;