Changeset 1489597

Timestamp:

09/03/2016 11:35:31 PM (9 years ago)

Author:

wellhandled

Message:

Release 1.5.2

Location:

well-handled/trunk

Files:

• index.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

well-handled/trunk/index.php

@@ -4 +4 @@
 Plugin URI: https://well-handled.io
 Description: Easy and powerful handlebar/mustache email template management for developers.
-Version: 1.5.1
+Version: 1.5.2
 Author: well-handled.io
 Author URI: https://well-handled.io
@@ -444 +444 @@
 
 //-------------------------------------------------
+// Reverse parse_url() to get back to a URL
+//
+// @param parsed
+// @return url or false
+function wh_unparse_url($parsed){
+
+    $url = '';
+
+    $defaults = array(
+        'scheme'=>'',
+        'host'=>'',
+        'user'=>'',
+        'pass'=>'',
+        'port'=>'',
+        'path'=>'',
+        'query'=>'',
+        'fragment'=>''
+    );
+    $parsed = wh_parse_args($parsed, $defaults);
+
+    //to simplify, unset anything without length
+    $parsed = array_map('trim', $parsed);
+    foreach($parsed AS $k=>$v){
+        $parsed[$k] = (string) $v;
+        if(!strlen($parsed[$k]))
+            unset($parsed[$k]);
+    }
+
+    //we don't really care about validating url integrity,
+    //but if nothing at all was passed then it is trash
+    if(!count($parsed))
+        return false;
+
+    if(isset($parsed['scheme']))
+        $url = "{$parsed['scheme']}:";
+
+    if(isset($parsed['host'])){
+        $url .= '//';
+
+        //is this a user:pass situation?
+        if(isset($parsed['user'])){
+            $url .= $parsed['user'];
+            if(isset($parsed['pass']))
+                $url .= ":{$parsed['pass']}";
+            $url .= '@';
+        }
+
+        //finally the host
+        $url .= (filter_var($parsed['host'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? "[{$parsed['host']}]" : $parsed['host']);
+
+        if(isset($parsed['port']))
+            $url .= ":{$parsed['port']}";
+
+        if(isset($parsed['path']) && substr($parsed['path'], 0, 1) !== '/')
+            $url .= '/';
+    }
+
+    if(isset($parsed['path']))
+        $url .= $parsed['path'];
+
+    if(isset($parsed['query']))
+        $url .= "?{$parsed['query']}";
+
+    if(isset($parsed['fragment']))
+        $url .= "#{$parsed['fragment']}";
+
+    return strlen($url) ? $url : false;
+}
+
+//-------------------------------------------------
 // is the blog utf-8?
 //
@@ -1003 +1073 @@
 
                     //append UTM
-                    if(!is_null($utm_query) && filter_var($url, FILTER_VALIDATE_URL) && in_array(parse_url($url, PHP_URL_SCHEME), array('http','https')) && (!$options['utm_local_only'] || wh_is_site_url($url)))
-                    {
-                        //add UTM to URL with query string
-                        $url .= (strlen(parse_url($url, PHP_URL_QUERY)) ? "&$utm_query" : "?$utm_query");
+                    if(!is_null($utm_query) && filter_var($url, FILTER_VALIDATE_URL) && in_array(parse_url($url, PHP_URL_SCHEME), array('http','https')) && (!$options['utm_local_only'] || wh_is_site_url($url))){
+
+                        //break down the URL into parts so we can mess with it the right way
+                        $parsed = parse_url($url);
+                        if(isset($parsed['query']) && strlen($parsed['query']))
+                            $parsed['query'] .= '&';
+                        $parsed['query'] .= $utm_query;
+
+                        $url = wh_unparse_url($parsed);
                         $link->setAttribute('href', $url);
                     }

well-handled/trunk/readme.txt

@@ -67 +67 @@
 == Changelog ==
 
+= 1.5.2 =
+* [fixed] bug affecting UTM tag insertion on links with #hash fragments
+
 = 1.5.1 =
 * [improved] #inflect helper can now accept an array as the 'count' variable;
@@ -90 +93 @@
 == Upgrade Notice ==
 
+= 1.5.2 =
+* [fixed] bug affecting UTM tag insertion on links with #hash fragments
+
 = 1.5.1 =
 * [improved] #inflect helper can now accept an array as the 'count' variable;