From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 21 May 2015 14:31:50 +0000 (-0400)
Subject: Fixed html issues with the wp_editor.
X-Git-Tag: v1.0.0~14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=87c7f124ada498dd48d0e228831b481146010527;p=WP-Plugins%2Fglm-member-db.git

Fixed html issues with the wp_editor.
---

diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 94c357f7..a62b83ee 100755
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -1205,11 +1205,10 @@ abstract class GlmDataAbstract
 
         // Otherwise, if no filter is specified.
         } else {
-            // Kill slashes and use the standard WordPress wp_kses_post() function to to the filtering then apply nl2br()
-            $in = nl2br(wp_kses_post(stripslashes($_POST[$as])));
+            // Kill slashes and use the standard WordPress wp_kses_post() function to do the filtering
+            $in = wp_kses_post(stripslashes($_POST[$as]));
         }
 
-
         // Check for required field
         if (isset($f['required']) && $f['required'] && trim($in) == '') {
             $this->inputFieldStatus = false;
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index cf18b807..89038c3f 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -90,10 +90,11 @@
             <tr>
                 <th {if $memberInfo.fieldRequired.descr}class="glm-required"{/if}>Description:</th>
                 <td {if $memberInfo.fieldFail.descr}class="glm-form-bad-input"{/if}>
-                    {php}
-                        wp_editor('{$memberInfo.fieldData.descr|escape:quotes|nl2br}', 'glm_descr', array(
+                    {php} 
+                        wp_editor('{$memberInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
                             // 'media_buttons' => true,
                             // 'quicktags' => false,
+                            'wpautop' => false,
                             'textarea_name' => 'descr',
                             'editor_height' => 200,     // Height in px, overrides editor_rows
                                 // 'textarea_rows' => 8