From 4c78492432ebbb7b2c9b9fc241bcb200263af983 Mon Sep 17 00:00:00 2001
From: Ron Shimshock <ron@shimshockgroup.com>
Date: Sat, 30 Apr 2016 13:24:05 -0500
Subject: [PATCH] Remove string formatting option

---
 jw_player.module | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/jw_player.module b/jw_player.module
index cadf475..522d08d 100644
--- a/jw_player.module
+++ b/jw_player.module
@@ -229,7 +229,7 @@ function jw_player_field_formatter_settings_summary($field, $instance, $view_mod
 
   $summary = array();
   if (isset($settings['jwplayer_preset'])) {
-    $preset_settings = jw_player_preset_settings($settings['jwplayer_preset'], 'array');
+    $preset_settings = jw_player_preset_settings($settings['jwplayer_preset']);
     // Formatted preset name and player type.
     $summary[] = $preset_settings['name'];
     if (isset($settings['player_type'])) {
@@ -289,13 +289,11 @@ function jw_player_field_formatter_settings_summary($field, $instance, $view_mod
  *
  * @param string $preset_machine_name
  *   Value set of the preset's machine name.
- * @param string $format (optional)
- *   Whether the preset settings are returned as an 'array' or formatted 'string'.
  *
- * @return array|string
- *   The preset settings stored in an array or as an imploded string for rendering.
+ * @return array
+ *   The preset settings stored in an array for rendering.
  */
-function jw_player_preset_settings($preset_machine_name, $format = 'string') {
+function jw_player_preset_settings($preset_machine_name) {
   $summary = array();
   $presets = jw_player_preset_load();
   $preset = $presets[$preset_machine_name];
@@ -387,7 +385,7 @@ function jw_player_preset_settings($preset_machine_name, $format = 'string') {
     $summary['source'] = t('Preset source: JW Player');
   }
 
-  return ($format == 'string') ? implode('<br />', $summary) : $summary;
+  return $summary;
 }
 
 /**
-- 
2.8.1