Changeset 836830

Timestamp:

01/11/2014 08:45:06 PM (12 years ago)

Author:

toppa

Message:

version 3.4.9

Location:

shashin/trunk

Files:

• ShashinWp.php (modified) (1 diff)
• admin/ShashinUpgradeWp.php (modified) (1 diff)
• lib/ShashinPhoto.php (modified) (1 diff)
• public/display/prettyphoto/jquery.prettyPhoto.js (modified) (1 diff)
• public/display/shashin.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• start.php (modified) (1 diff)

shashin/trunk/ShashinWp.php

@@ -2 +2 @@
 
 class ShashinWp {
-    private $version = '3.4.8';
+    private $version = '3.4.9';
 
     public function __construct() {

shashin/trunk/admin/ShashinUpgradeWp.php

@@ -130 +130 @@
         $this->dbFacade->executeQuery("alter table {$this->photoTable} change link_url linkUrl text");
         $this->dbFacade->executeQuery("alter table {$this->photoTable} change content_url contentUrl text");
-        $this->dbFacade->executeQuery("alter table {$this->photoTable} change taken_timestamp takenTimestamp int unsigned");
+        $this->dbFacade->executeQuery("alter table {$this->photoTable} change taken_timestamp takenTimestamp bigint");
         $this->dbFacade->executeQuery("alter table {$this->photoTable} change uploaded_timestamp uploadedTimestamp int unsigned");
         $this->dbFacade->executeQuery("alter table {$this->photoTable} change include_in_random includeInRandom char(1)");

shashin/trunk/lib/ShashinPhoto.php

@@ -95 +95 @@
             'takenTimestamp' => array(
                 'db' => array(
-                    'type' => 'int unsigned',
-                    'not_null' => true),
+                    'type' => 'bigint'),
                 'picasa' => array('exif$tags', 'exif$time', '$t'),
                 'twitpic' => array('timestamp'),

shashin/trunk/public/display/prettyphoto/jquery.prettyPhoto.js

@@ -93 +93 @@
             inline_markup: '<div class="pp_inline">{content}</div>',
             custom_markup: '',
-            social_tools: '<div class="pp_twitter"><script type="text/javascript" src="https://plugins.trac.wordpress.org//platform.twitter.com/widgets.js"></script><a href="https://twitter.com/intent/tweet?url={location_href}&amp;text={text}" class="twitter-share-button" data-count="none">Tweet</a></div><div class="pp_facebook"><a href="http://www.facebook.com/sharer.php?s=100&amp;p[images][0]={path}&amp;p[url]={location_href}&amp;p[title]={text}" target="_blank" onclick="shashinPopup(this.href, 550, 450); return false;">Share on Facebook</a></div><div class="pp_pinterest"><a href="http://pinterest.com/pin/create/button/?url={location_href}&amp;media={path}&amp;description={text}" target="_blank" onclick="shashinPopup(this.href, 550, 450); return false;">Pin it</a></div><div class="pp_link"><a href="#" onclick="shashinLinkPrompt(&#39;{location_href}&#39;); return false;">Share link</a></div>' /* html or false to disable */
+            social_tools: '<div class="pp_twitter"><script type="text/javascript" src="https://plugins.trac.wordpress.org//platform.twitter.com/widgets.js"></script><a href="https://twitter.com/intent/tweet?url={location_href}&amp;text={text}" class="twitter-share-button" data-count="none">Tweet</a></div><div class="pp_facebook"><a href="http://www.facebook.com/sharer.php?s=100&amp;p[images][0]={path}&amp;p[url]={location_href}&amp;p[title]={text}" target="_blank" onclick="Shashin.popup(this.href, 550, 450); return false;">Share on Facebook</a></div><div class="pp_pinterest"><a href="http://pinterest.com/pin/create/button/?url={location_href}&amp;media={path}&amp;description={text}" target="_blank" onclick="Shashin.popup(this.href, 550, 450); return false;">Pin it</a></div><div class="pp_link"><a href="#" onclick="Shashin.linkPrompt(&#39;{location_href}&#39;); return false;">Share link</a></div>' /* html or false to disable */
         }, pp_settings);
 

shashin/trunk/public/display/shashin.js

@@ -441 +441 @@
 
     return {
-        shashinPopup: popup,
-        shashinLinkPrompt: linkPrompt
+        popup: popup,
+        linkPrompt: linkPrompt
     }
 })(jQuery);

shashin/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0
 Tested up to: 3.8
-Stable tag: 3.4.8
+Stable tag: 3.4.9
 License: GPLv2 or later
 
@@ -94 +94 @@
 
 == Changelog ==
+
+= 3.4.9 =
+
+* Bug fix: the popup for copying and pasting a photo's URL wasn't work (bug introduced in 3.4.7)
+* Bug fix: allow a photo's TakenTimestamp to be null, and allow negative values (for times before 1970, or times not defined)
 
 = 3.4.8 = Bug fix: call debounce function for resizing only when the window is resized (bug introduced in 3.4.7)

shashin/trunk/start.php

@@ -5 +5 @@
 Description: A plugin for integrating photos and videos from Picasa, YouTube, and Twitpic in WordPress.
 Author: Michael Toppa
-Version: 3.4.8
+Version: 3.4.9
 Author URI: http://www.toppa.com
 License: GPLv2 or later