Changeset 188207

Timestamp:

12/30/2009 04:58:10 PM (16 years ago)

Author:

divinenephron

Message:

URLs with queries in are now supported (the query is just ignored).

Location:

picasa-picture-embed

Files:

• tags/1.1.0 (copied) (copied from picasa-picture-embed/trunk)
• tags/1.1.0/Library (copied) (copied from picasa-picture-embed/trunk/Library)
• tags/1.1.0/picasaweb-embed.php (copied) (copied from picasa-picture-embed/trunk/picasaweb-embed.php) (3 diffs)
• tags/1.1.0/readme.txt (copied) (copied from picasa-picture-embed/trunk/readme.txt) (3 diffs)
• tags/1.1.0/screenshot-1.png (copied) (copied from picasa-picture-embed/trunk/screenshot-1.png)
• tags/1.1.0/screenshot-2.png (copied) (copied from picasa-picture-embed/trunk/screenshot-2.png)
• tags/1.1.0/screenshot-3.png (copied) (copied from picasa-picture-embed/trunk/screenshot-3.png)
• trunk/picasaweb-embed.php (modified) (3 diffs)
• trunk/readme.txt (modified) (3 diffs)

picasa-picture-embed/tags/1.1.0/picasaweb-embed.php

@@ -3 +3 @@
  * @package Picasaweb_Embed
  * @author Devon Buchanan
- * @version 1.0
+ * @version 1.1
  */
 /*
@@ -10 +10 @@
 Description: A plugin that allows you to embed picasa photos with the Wordpress 2.9 embedding feature. Include the url of the photo on a line of its own or between [embed] tags and the photo will be embedded.
 Author: Devon Buchanan
-Version: 1.0
+Version: 1.1
 Author URI: http://www.srcf.ucam.org/~db505/
 */
@@ -48 +48 @@
         // After a post is saved, invalidate the oEmbed cache
         add_action( 'save_post', array(&$this, 'delete_picasaweb_caches') );
-    wp_embed_register_handler( 'picasaweb', '|http://picasaweb\.google\.(?P<tld>[A-Za-z.]{2,5})/(?P<username>\w+?)/(?P<albumname>\w+?)#(?P<photoid>\d+)|i', array(&$this, 'handler'));
+    wp_embed_register_handler( 'picasaweb', '|http://picasaweb\.google\.(?P<tld>[A-Za-z.]{2,5})/(?P<username>\w+?)/(?P<albumname>\w+?)(\?[^#]*)?#(?P<photoid>\d+)|i', array(&$this, 'handler'));
     $this->picasaweb = new Zend_Gdata_Photos();
         // handler() is dependant on the array being in ascending order

picasa-picture-embed/tags/1.1.0/readme.txt

@@ -4 +4 @@
 Requires at least: 2.9
 Tested up to: 2.9
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 
 A plugin that allows you to embed picasa photos into your posts with the Wordpress 2.9 embedding feature.
@@ -37 +37 @@
 1. Are you using Wordpress > 2.9?
 2. Have you enabled auto embeds in the `Settings -> Media` page?
-3. Have you used the right url -- only urls in the form `http://picasaweb.google.com/{user}/{album}#{photo}` are supported (e.g. `http://picasaweb.google.com/linmep/PicAutumn09#5410318127990876210`)?
 3. Is the image you're trying to embed visible to the public?
+4. Have you used the right url -- only urls in the form `http://picasaweb.google.com/{user}/{album}#{photo}` are supported (e.g. `http://picasaweb.google.com/linmep/PicAutumn09#5410318127990876210`). Search URLs (e.g. `http://picasaweb.google.com/lh/view?q=leaf&psc=G&filter=1#5325823428363864770`) don't work.
 
 If you can answer "yes" to the above the plugin may indeed be broken.
@@ -57 +57 @@
 * Automatically chooses the largest necessary size for the photo based on the `width` and `height` attributes
 
+= 1.1 =
+* Added support for urls with queries (e.g. `http://picasaweb.google.com/missyann63/PicAutumn09?feat=featured#5409726203440714818`). Note the `?feat=featured`.
+
 == Upgrade Notice ==
 

picasa-picture-embed/trunk/picasaweb-embed.php

@@ -3 +3 @@
  * @package Picasaweb_Embed
  * @author Devon Buchanan
- * @version 1.0
+ * @version 1.1
  */
 /*
@@ -10 +10 @@
 Description: A plugin that allows you to embed picasa photos with the Wordpress 2.9 embedding feature. Include the url of the photo on a line of its own or between [embed] tags and the photo will be embedded.
 Author: Devon Buchanan
-Version: 1.0
+Version: 1.1
 Author URI: http://www.srcf.ucam.org/~db505/
 */
@@ -48 +48 @@
         // After a post is saved, invalidate the oEmbed cache
         add_action( 'save_post', array(&$this, 'delete_picasaweb_caches') );
-    wp_embed_register_handler( 'picasaweb', '|http://picasaweb\.google\.(?P<tld>[A-Za-z.]{2,5})/(?P<username>\w+?)/(?P<albumname>\w+?)#(?P<photoid>\d+)|i', array(&$this, 'handler'));
+    wp_embed_register_handler( 'picasaweb', '|http://picasaweb\.google\.(?P<tld>[A-Za-z.]{2,5})/(?P<username>\w+?)/(?P<albumname>\w+?)(\?[^#]*)?#(?P<photoid>\d+)|i', array(&$this, 'handler'));
     $this->picasaweb = new Zend_Gdata_Photos();
         // handler() is dependant on the array being in ascending order

picasa-picture-embed/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 2.9
 Tested up to: 2.9
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 
 A plugin that allows you to embed picasa photos into your posts with the Wordpress 2.9 embedding feature.
@@ -37 +37 @@
 1. Are you using Wordpress > 2.9?
 2. Have you enabled auto embeds in the `Settings -> Media` page?
-3. Have you used the right url -- only urls in the form `http://picasaweb.google.com/{user}/{album}#{photo}` are supported (e.g. `http://picasaweb.google.com/linmep/PicAutumn09#5410318127990876210`)?
 3. Is the image you're trying to embed visible to the public?
+4. Have you used the right url -- only urls in the form `http://picasaweb.google.com/{user}/{album}#{photo}` are supported (e.g. `http://picasaweb.google.com/linmep/PicAutumn09#5410318127990876210`). Search URLs (e.g. `http://picasaweb.google.com/lh/view?q=leaf&psc=G&filter=1#5325823428363864770`) don't work.
 
 If you can answer "yes" to the above the plugin may indeed be broken.
@@ -57 +57 @@
 * Automatically chooses the largest necessary size for the photo based on the `width` and `height` attributes
 
+= 1.1 =
+* Added support for urls with queries (e.g. `http://picasaweb.google.com/missyann63/PicAutumn09?feat=featured#5409726203440714818`). Note the `?feat=featured`.
+
 == Upgrade Notice ==