Changeset 882543

Timestamp:

03/26/2014 07:40:04 PM (12 years ago)

Author:

AlphaGolf_fr

Message:

Update the trunk with 0.27.22 / build 2722

Location:

wp-symposium-toolbar/trunk

Files:

• readme.txt (modified) (2 diffs)
• wp-symposium-toolbar.php (modified) (2 diffs)
• wp-symposium-toolbar_admin_functions.php (modified) (3 diffs)
• wp-symposium-toolbar_functions.php (modified) (6 diffs)

wp-symposium-toolbar/trunk/readme.txt

@@ -9 +9 @@
 Tested up to: 3.8.1
 Stable tag: 0.27.0
-Version: 0.27.20
+Version: 0.27.22
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -157 +157 @@
 * Change: WP 3.9, make use of 'rel' meta added to WP_Admin_Bar::add_node() for Custom Menus relationships set from WP NavMenus page (requires at least WP 3.9)
 * Bugfix: get rid of PHP notices when a gradient is set without a background color
-* Bugfix: Styles, both previewed and saved, username now adheres to WP default color when no font color is set in dropdown menus, likewise on hover
+* Bugfix: Styles, username now adheres to WP default color when no font color is set in dropdown menus, likewise on hover
 * Bugfix: WP 3.8, Styles, make menu items' background colors transparent on hover (no default value)
 * Bugfix: WP 3.8, make sure the default CSS file is loaded at all pages when Admin chooses to style the Toolbar accross the whole dashbard
+* Bugfix: WP 3.8, use SSL on the URL over the share icons when SSL is active
 
 = 0.27.0. =

wp-symposium-toolbar/trunk/wp-symposium-toolbar.php

@@ -11 +11 @@
 Tested up to: 3.8.1
 Stable tag: 0.27.0
-Version: 0.27.20
+Version: 0.27.22
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -23 +23 @@
 // Increase Build nr at each version
 global $wpst_buildnr;
-$wpst_buildnr = 2720;
+$wpst_buildnr = 2722;
 
 

wp-symposium-toolbar/trunk/wp-symposium-toolbar_admin_functions.php

@@ -2576 +2576 @@
     // If a hover color was defined for non-Highlighted Items, force back hover color to WP default for Highlighted Items
     if ( isset( $wpst_style_tb_current['menu_hover_font_colour'] ) ) $menu_hover_ext_font_colour = $wpst_default_toolbar['menu_hover_ext_font_colour'];
+    if ( isset( $menu_hover_font_colour ) ) $menu_hover_ext_font_colour = $wpst_default_toolbar['menu_hover_ext_font_colour'];
     
     // If a hover color was defined for Highlighted Items, force hover/focus color to WP default for non-Highlighted Items
@@ -2615 +2616 @@
         } else
             $style_saved .= '#wpadminbar .quicklinks .menupop .ab-submenu > li:hover > .ab-item, #wpadminbar .quicklinks .menupop .ab-submenu > li.hover > .ab-item, #wpadminbar .quicklinks .menupop .ab-submenu > li .ab-item:focus, #wpadminbar #wp-admin-bar-user-info .ab-item:hover, #wpadminbar #wp-admin-bar-user-info .ab-item:hover span { ' . $style_chunk . '} ';
-        $style_chunk = "";
     }
     
@@ -2639 +2639 @@
     // Menu Hover for Blavatars
     if ( is_multisite() && version_compare( $wp_version, '3.8-alpha', '>' ) ) {
+        
+        // Force it
+        // if ( $style_chunk_ext == "" ) $style_chunk_ext = $style_chunk;
         
         // "W" icons in My Sites dropdown menu - add font color and shadow, not the attributes

wp-symposium-toolbar/trunk/wp-symposium-toolbar_functions.php

@@ -850 +850 @@
     $blog_name = get_bloginfo('name');
     $parent = get_option( 'wpst_share_icons_position', '' );
+    $http_prefix = ( is_ssl() ) ? "https://" : "http://";
     $class = get_option( 'wpst_share_icons_set', 'lightweight' );
     if ( get_option( 'wpst_share_icons_color', '' ) == 'on' ) $class .= ' brand';
@@ -885 +886 @@
             'parent' => $parent,
             'title' => '',
-            'href' => 'http://www.linkedin.com/shareArticle?mini=true&url=' . $shared_url,
+            'href' => $http_prefix . 'www.linkedin.com/shareArticle?mini=true&url=' . $shared_url,
             'meta' => array( 'title' => __( "Share this on LinkedIn", 'wp-symposium-toolbar' ), 'class' => 'symposium-toolbar-share-icon symposium-toolbar-share-linkedin '.$class, 'target' => '_blank' )
         );
@@ -897 +898 @@
             'parent' => $parent,
             'title' => '',
-            'href' => 'http://www.facebook.com/sharer.php?u=' . $shared_url,
+            'href' => $http_prefix . 'www.facebook.com/sharer.php?u=' . $shared_url,
             'meta' => array( 'title' => __( "Share this on Facebook", 'wp-symposium-toolbar' ), 'class' => 'symposium-toolbar-share-icon symposium-toolbar-share-facebook '.$class, 'target' => '_blank' )
         );
@@ -909 +910 @@
             'parent' => $parent,
             'title' => '',
-            'href' => 'http://twitter.com/share?url=' . $shared_url . '&text=' . $blog_name,
+            'href' => $http_prefix . 'twitter.com/share?url=' . $shared_url . '&text=' . $blog_name,
             /* translators: alternatively, this could be translated with "share this on Twitter" */
             'meta' => array( 'title' => __( "Tweet this", 'wp-symposium-toolbar' ), 'class' => 'symposium-toolbar-share-icon symposium-toolbar-share-twitter '.$class, 'target' => '_blank' )
@@ -922 +923 @@
             'parent' => $parent,
             'title' => '',
-            'href' => 'https://plus.google.com/share?url=' . $shared_url,
+            'href' => $http_prefix . 'plus.google.com/share?url=' . $shared_url,
             'meta' => array( 'title' => __( "Share this on Google Plus", 'wp-symposium-toolbar' ), 'class' => 'symposium-toolbar-share-icon symposium-toolbar-share-google-plus '.$class, 'target' => '_blank' )
         );
@@ -934 +935 @@
             'parent' => $parent,
             'title' => '',
-            'href' => 'http://www.stumbleupon.com/submit?url=' . $shared_url . '&title=' . $blog_name,
+            'href' => $http_prefix . 'www.stumbleupon.com/submit?url=' . $shared_url . '&title=' . $blog_name,
             'meta' => array( 'title' => __( "Share this on StumbleUpon", 'wp-symposium-toolbar' ), 'class' => 'symposium-toolbar-share-icon symposium-toolbar-share-stumbleupon '.$class, 'target' => '_blank' )
         );