From 1cb00fc2d03102de576c7375ad53e77cd99c4204 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 5 Oct 2011 14:53:36 +0000
Subject: [PATCH] [gh-234] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1115 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/unl.module | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sites/all/modules/unl/unl.module b/sites/all/modules/unl/unl.module
index c4438828..6343d987 100644
--- a/sites/all/modules/unl/unl.module
+++ b/sites/all/modules/unl/unl.module
@@ -204,7 +204,7 @@ function unl_wysiwyg_plugin($editor) {
'options' => array(
'skin' => 'unl',
'table_styles' => 'ZenTable Bright (yellow)=zentable bright;ZenTable Cool (blue)=zentable cool;ZenTable Energetic (orange)=zentable energetic;ZenTable Soothing (green)=zentable soothing;ZenTable Primary (red)=zentable primary;ZenTable Neutral (gray)=zentable neutral;', 'doctype' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
- 'valid_elements' => '*[*],script[src|type=text/javascript]',
+ 'valid_elements' => '*[*],script[charset|defer|id|src|type=text/javascript]',
),
)
// Wysiwyg wrapper plugin AJAX callback.
--
GitLab