From 12ad221d2906ac7f9b3c0ca4a0b127b3e497bc1a Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 30 Sep 2009 21:50:16 -0400
Subject: [PATCH] add nl2br support

---
 classes/WhatDidTheySayAdmin.inc      |  9 +++++++--
 classes/partials/_default-styles.inc | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/classes/WhatDidTheySayAdmin.inc b/classes/WhatDidTheySayAdmin.inc
index e751720..e3348dc 100644
--- a/classes/WhatDidTheySayAdmin.inc
+++ b/classes/WhatDidTheySayAdmin.inc
@@ -20,7 +20,8 @@ class WhatDidTheySayAdmin {
     'load_default_styles' => true,
     'automatic_embedding' => true,
     'search_integration' => true,
-    'excerpt_distance' => 30
+    'excerpt_distance' => 30,
+    'use_nl2br' => false
   );
   
   var $capabilities = array();
@@ -228,7 +229,10 @@ class WhatDidTheySayAdmin {
    * @return string The processed transcription text.
    */
   function the_media_transcript($transcript, $content = "") {
-    return array($transcript, '<div class="transcript">' . do_shortcode($transcript) . '</div>');
+    $content = do_shortcode($transcript);
+    $options = get_option('what-did-they-say-options');
+    if ($options['use_nl2br']) { $content = nl2br($content); }
+    return array($transcript, '<div class="transcript">' . $content . '</div>');
   }
 
   /**
@@ -499,6 +503,7 @@ class WhatDidTheySayAdmin {
       $options = get_option('what-did-they-say-options');
 
       $options['load_default_styles'] = isset($info['default_styles']);
+      $options['use_nl2br'] = isset($info['use_nl2br']);
       $options['excerpt_distance'] = !empty($info['excerpt_distance']) ? $info['excerpt_distance'] : 30;
       
       update_option('what-did-they-say-options', $options);
diff --git a/classes/partials/_default-styles.inc b/classes/partials/_default-styles.inc
index 40925c9..f7c97a5 100644
--- a/classes/partials/_default-styles.inc
+++ b/classes/partials/_default-styles.inc
@@ -13,15 +13,27 @@
       </label>
       
       <label>
-        <?php _e('Include default CSS styles for transcripts:', 'what-did-they-say') ?>
         <input type="checkbox"
                name="wdts[default_styles]"
                value="yes"
-               <?php echo ($options['load_default_styles'] ? 'checked="checked"' : '') ?> /> 
+               <?php echo ($options['load_default_styles'] ? 'checked="checked"' : '') ?> />
+        <?php _e('Include default CSS styles for transcripts', 'what-did-they-say') ?>
+      </label>
+
+      <label>
+        <input type="checkbox"
+               name="wdts[use_nl2br]"
+               value="yes"
+               <?php echo ($options['use_nl2br'] ? 'checked="checked"' : '') ?> />
+        <?php _e('Turn transcript line breaks into HTML new lines (nl2br())', 'what-did-they-say') ?>
       </label>
       <input class="button" type="submit" value="<?php _e('Change default styles', 'what-did-they-say') ?>" />
     </form>
 
+    <h3><?php _e('Transcript Line Breaks', 'what-did-they-say') ?></h3>
+
+    <p><?php _e('If you\'re using short codes or HTML to construct your transcripts, you don\'t need to enable transcript line breaks.', 'what-did-they-say') ?></p>
+
     <h3><?php _e('Default CSS Selectors Information', 'what-did-they-say') ?></h3>
 
     <p><?php _e('By default, the following CSS selectors are used by <strong>What Did They Say?!?</strong>:', 'what-did-they-say') ?></p>