From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 4 Oct 2016 18:01:32 +0000 (-0400)
Subject: Incorrect function call corrected.
X-Git-Tag: v2.6.5^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=229435709d45b4316b1c9b834b640ca5eb4cec1c;p=WP-Plugins%2Fglm-member-db.git

Incorrect function call corrected.
---

diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php
index 5cc6d5e0..36254a1e 100644
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@ -510,7 +510,9 @@ class GlmDataMemberInfo extends GlmDataAbstract
          * This will add a protocol prefix to the live cam url
          */
         $liveCamUrl = $r['live_cam_url'];
-        $r['live_cam_url'] = addUrlProtocol($liveCamUrl);
+        if (!preg_match("~^(?:f|ht)tps?://~i", $liveCamUrl)) {
+            $r['live_cam_url'] = "http://" . $liveCamUrl;
+        }
 
         $formattedStr = trim(preg_replace('/\s\s+/', ' ', $r['short_descr']));
         $r['short_descr'] = substr($formattedStr, 0, 120).$dotdotdot;
diff --git a/index.php b/index.php
index 39eb7515..1c14df00 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 2.6.4
+ * Version: 2.6.5
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.6.4
+ * @version 2.6.5
  */
 
 /*
@@ -38,7 +38,7 @@
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.6.4');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.6.5');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.19');
 
 // Check if plugin version is not current in WordPress option and if needed updated it