From 5fd83abb5d6a56bf8b4552ed2afc2b74fa5625c4 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 24 May 2013 12:58:49 -0500
Subject: [PATCH] Remove TinyMCE valid elements tweaks (no longer necessary)

---
 CHANGELOG.md    |  1 +
 lib/cleanup.php | 16 ----------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5213132..1e84f3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Remove TinyMCE valid elements tweaks (no longer necessary)
 * Remove additional widget classes
 * Move `/assets/css/less/` to `/assets/less/`
 * Add wrapper templates filter
diff --git a/lib/cleanup.php b/lib/cleanup.php
index f25c573..9ca01d3 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -379,22 +379,6 @@ function roots_remove_default_description($bloginfo) {
 }
 add_filter('get_bloginfo_rss', 'roots_remove_default_description');
 
-/**
- * Allow more tags in TinyMCE including <iframe> and <script>
- */
-function roots_change_mce_options($options) {
-  $ext = 'pre[id|name|class|style],iframe[align|longdesc|name|width|height|frameborder|scrolling|marginheight|marginwidth|src],script[charset|defer|language|src|type]';
-
-  if (isset($initArray['extended_valid_elements'])) {
-    $options['extended_valid_elements'] .= ',' . $ext;
-  } else {
-    $options['extended_valid_elements'] = $ext;
-  }
-
-  return $options;
-}
-add_filter('tiny_mce_before_init', 'roots_change_mce_options');
-
 /**
  * Redirects search results from /?s=query to /search/query/, converts %20 to +
  *