[gh-47] Merging changes into production

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/production@367 20a16fea-79d4-4915-8869-1ea9d5ebf173

[gh-47] Merging changes into production
84133611 · Tim Steiner · c0998d2f · 84133611
Commit 84133611 authored 14 years ago by Tim Steiner
--- a/sites/all/modules/unl/unl.module
+++ b/sites/all/modules/unl/unl.module
@@ -46,8 +46,8 @@ 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' => '*[*]',
          ),
-          'extended_valid_elements' => array('*[*]'),
        )
        // Wysiwyg wrapper plugin AJAX callback.
        // 'callback' => url('myplugin/browse'),