Changeset 535823

Timestamp:

04/24/2012 09:10:25 PM (14 years ago)

Author:

jczorkmid

Message:

fix for WordPress 3.3.2

Location:

use-google-libraries/trunk

Files:

• README.txt (modified) (4 diffs)
• use-google-libraries.php (modified) (4 diffs)

use-google-libraries/trunk/README.txt

@@ -4 +4 @@
 Tags: javascript, performance, CDN, Google, jQuery, Prototype, MooTools, Dojo, Google AJAX Libraries API, YSlow, Page Speed
 Requires at least: 2.9.1
-Tested up to: 3.3
-Stable tag: 1.2
+Tested up to: 3.3.2
+Stable tag: 1.2.1
 
 Allows your site to use common javascript libraries from Google's AJAX 
@@ -70 +70 @@
 **Incompatible Themes** for specific information. 
 
+= How do I use the libraries supplied by Use Google Libraries? =
+
+The same way you use them when Use Google Libraries isn't installed using 
+'wp_enqueue_script'.  In fact you should develop your theme or plugin without
+Use Google Libraries being enabled at all, then test it both ways.
+
 == Incompatible Plugins ==
 
@@ -81 +87 @@
 
 == Changelog ==
+
+= 1.2.1 = 
+
++ Added check for WordPress including non-standard versions of scripts (fixes
+WordPress 3.2.2/swfobject).
++ Fixed incorrect case in HTTPS check.
 
 = 1.2 = 
@@ -158 +170 @@
 == Upgrade Notice ==
 
-= 1.2 =
-Dependency support improved. Needed for WordPress 3.3.
+= 1.2.1 =
+Required for WordPress 3.3.2
 
 == A Request ==

use-google-libraries/trunk/use-google-libraries.php

@@ -4 +4 @@
   Plugin URI: http://jasonpenney.net/wordpress-plugins/use-google-libraries/
   Description:Allows your site to use common javascript libraries from Google's AJAX Libraries CDN, rather than from Wordpress's own copies.
-  Version: 1.2
+  Version: 1.2.1
   Author: Jason Penney
   Author URI: http://jasonpenney.net/
@@ -55 +55 @@
         protected static $script_before_init_notice =
             '<strong>Use Google Libraries</strong>: Another plugin has registered or enqued a script before the "init" action.  Attempting to work around it.';
-
         /**
          * PHP 4 Compatible Constructor
@@ -152 +151 @@
                 or
                 ( isset( $_SERVER ) and
-                    ( ( isset( $_SERVER['HTTPS'] ) and $_SERVER['https'] !='' and $_SERVER['HTTPS'] != 'off' )
+                    ( ( isset( $_SERVER['HTTPS'] ) and $_SERVER['HTTPS'] !='' and $_SERVER['HTTPS'] != 'off' )
                         or
                         ( isset( $_SERVER['SERVER_PORT'] ) and $_SERVER['SERVER_PORT'] == '443' ) ) ) ) {
@@ -227 +226 @@
                     // default to requested ver
                     $ver = $script->ver;
+                    
+                    if ( strpos( $ver, '-' ) !== false ) {
+                        if ( WP_DEBUG !== false ) {
+                            error_log("WordPress appears to be using a non-standard version of $name (version $ver). Use Google Libraries not enabled for $name.");
+                        }
+                        continue;
+                    }
 
                     // TODO: replace with more flexible option