From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 1 Dec 2016 16:05:15 +0000 (-0500)
Subject: Updating import for description and intro text.
X-Git-Tag: v1.5.8^2~8^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6bcaa8a8055cbf177038b67797f92b2f5ab0e99c;p=WP-Plugins%2Fglm-member-db-events.git

Updating import for description and intro text.

Removing the newlines in intro and description
---

diff --git a/models/admin/management/events.php b/models/admin/management/events.php
index ff0149c..cc23d00 100644
--- a/models/admin/management/events.php
+++ b/models/admin/management/events.php
@@ -721,25 +721,10 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                     }
                 }
                 if ( $old_event_format ) {
-                    $intro = substr(
-                        str_replace(
-                            "\n",
-                            ' ',
-                            strip_tags( $event['descr'] )
-                        ),
-                        0,
-                        150
-                    );
-                    $descr = preg_replace(
-                        '%<br />|<br>%',
-                        '',
-                        $event['descr']
-                    );
-                    $descr = str_replace(
-                        "\n",
-                        '',
-                        $descr
-                    );
+                    $intro = substr( trip_tags( $event['descr'] ), 0, 150 );
+                    // Remove uneeded newlines from both intro and description
+                    $intro = preg_replace( "/\s\s+/", ' ', $intro );
+                    $descr = preg_replace( "/\s\s+/", ' ', $event['descr'] );
                     $event_data = array(
                         'status'   => (($event['visable'] == '1')
                             ? $this->config['status_numb']['Active']
@@ -805,8 +790,11 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                         $filename = $fileData['urltext'];
                     }
                     $intro = ($event['intro'])
-                        ? substr(strip_tags($event['intro']), 0, 250)
-                        : substr(strip_tags($event['description']), 0, 250);
+                        ? substr(strip_tags($event['intro']), 0, 150)
+                        : substr(strip_tags($event['description']), 0, 150);
+                    // Remove uneeded newlines from both intro and description
+                    $intro = preg_replace( "/\s\s+/", ' ', $intro );
+                    $descr = preg_replace( "/\s\s+/", ' ', $event['description'] );
                     $event_data = array(
                         'status'   => (($event['active'] == '1')
                             ? $this->config['status_numb']['Active']
@@ -816,7 +804,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
                         'approved'            => $event['approved'],
                         'name'                => $event['header'],
                         'intro'               => $intro,
-                        'descr'               => $event['description'],
+                        'descr'               => $descr,
                         'image'               => $event['image'],
                         'file1'               => $file,
                         'file1_descr'         => $filename,