From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 19 Dec 2014 16:11:19 +0000 (-0500)
Subject: fix names
X-Git-Tag: v1.0.1~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=77f74b6e5248160955e25a7c4147dcb258e3e523;p=WP-Plugins%2Fglm-blocks.git

fix names

use single case name to keep confusion from entering
---

diff --git a/models/block.php b/models/block.php
index 8fcfb30..c0baf44 100644
--- a/models/block.php
+++ b/models/block.php
@@ -81,13 +81,13 @@ class glm_models_block
 
     public function metaBoxCallBack($post)
     {
-        $glm_blocks_url     = ($post)
+        $glm_block_url     = ($post)
             ? get_post_meta($post->ID, 'glm_block_url', true)
             : '';
-        $glm_blocks_ext_url = ($post)
+        $glm_block_ext_url = ($post)
             ? get_post_meta($post->ID, 'glm_block_ext_url', true)
             : '';
-        $glm_blocks_page    = ($post)
+        $glm_block_page    = ($post)
             ? get_post_meta($post->ID, 'glm_block_page', true)
             : '';
         include $this->pluginDirName . 'views/admin/metaBoxes.php';
@@ -128,12 +128,18 @@ class glm_models_block
         );
         $blocks = get_posts($args);
         foreach ($blocks as $block) {
+            $block->externalUrl = false;
             $custom                   = get_post_custom($block->ID);
             if ($custom['glm_block_url'][0] == 'page') {
                 $block->url = get_permalink($custom['glm_block_page'][0]);
             }
             if ($custom['glm_block_url'][0] == 'url') {
-                $block->url = $custom['glm_block_ext_url'][0];
+                if ($custom['glm_block_ext_url'][0] != '') {
+                    $block->url = (preg_match('/^http:\/\//', $custom['glm_block_ext_url'][0]))
+                        ? $custom['glm_block_ext_url'][0]
+                        : 'http://' . $custom['glm_block_ext_url'][0];
+                    $block->externalUrl = true;
+                }
             }
             $block->thumbnail         = get_the_post_thumbnail(
                 $block->ID, array(298, 228), array('class' => 'aligncenter')