summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-09-11 07:55:30 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-09-11 07:55:30 -0400
commit665c15ca32b65c69491c564860f89d932ef774ec (patch)
treec65975754c261f1e99cd987e1095b2b27e702d87 /plugins/jetpack/modules/videopress
parentUpdate theme mantra to 2.6.0 (diff)
downloadblogs-gentoo-665c15ca32b65c69491c564860f89d932ef774ec.tar.gz
blogs-gentoo-665c15ca32b65c69491c564860f89d932ef774ec.tar.bz2
blogs-gentoo-665c15ca32b65c69491c564860f89d932ef774ec.zip
Update plugin jetpack to 4.3.1
Diffstat (limited to 'plugins/jetpack/modules/videopress')
-rw-r--r--plugins/jetpack/modules/videopress/class.videopress-video.php5
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin-rtl.css1
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin.min.css1
3 files changed, 6 insertions, 1 deletions
diff --git a/plugins/jetpack/modules/videopress/class.videopress-video.php b/plugins/jetpack/modules/videopress/class.videopress-video.php
index 9120ffc1..eb0b8e40 100644
--- a/plugins/jetpack/modules/videopress/class.videopress-video.php
+++ b/plugins/jetpack/modules/videopress/class.videopress-video.php
@@ -254,7 +254,10 @@ class VideoPress_Video {
if ( empty( $expires_header ) || ! is_string( $expires_header ) )
return false;
- if ( class_exists( 'DateTime' ) && class_exists( 'DateTimeZone' ) ) {
+ if (
+ class_exists( 'DateTimeZone' )
+ && method_exists( 'DateTime', 'createFromFormat' )
+ ) {
$expires_date = DateTime::createFromFormat( 'D, d M Y H:i:s T', $expires_header, new DateTimeZone( 'UTC' ) );
if ( $expires_date instanceOf DateTime )
return date_format( $expires_date, 'U' );
diff --git a/plugins/jetpack/modules/videopress/videopress-admin-rtl.css b/plugins/jetpack/modules/videopress/videopress-admin-rtl.css
index 41c86793..149dba9e 100644
--- a/plugins/jetpack/modules/videopress/videopress-admin-rtl.css
+++ b/plugins/jetpack/modules/videopress/videopress-admin-rtl.css
@@ -1,3 +1,4 @@
+/* Do not modify this file directly. It is concatenated from individual module CSS files. */
/**
* VideoPress admin media styles
*/
diff --git a/plugins/jetpack/modules/videopress/videopress-admin.min.css b/plugins/jetpack/modules/videopress/videopress-admin.min.css
index 51b65e77..550c1337 100644
--- a/plugins/jetpack/modules/videopress/videopress-admin.min.css
+++ b/plugins/jetpack/modules/videopress/videopress-admin.min.css
@@ -1 +1,2 @@
+/* Do not modify this file directly. It is concatenated from individual module CSS files. */
.videopress-modal-backdrop{background:#000;opacity:.7;position:absolute;top:0;width:100%;height:100%;overflow:hidden;z-index:100}.videopress-modal{padding:10px 20px;background:#fff;position:absolute;top:0;width:440px;overflow:hidden;left:50%;margin-left:-220px;z-index:101;box-shadow:2px 2px 5px 2px rgba(0,0,0,.5);-webkit-border-bottom-right-radius:2px;-webkit-border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:2px}.videopress-modal .submit{text-align:right;padding:10px 0 5px}.videopress-preview{display:block;float:right;width:65%;margin-top:18px;background:#000;min-height:97px;text-decoration:none}.vp-preview span.videopress-preview-unavailable{width:65%;float:right;text-align:left;margin-right:0}.videopress-preview img{float:left;width:100%}.videopress-preview span{display:block;padding-top:40px;color:#fff!important;text-align:center}.vp-setting .help{margin:0 0 4px 35%}.media-sidebar .vp-setting input[type=checkbox]{float:left;margin-top:10px}.vp-setting label{float:left;margin:8px 8px 0 5px;max-width:135px}.vp-setting input[type=radio]{float:left;margin-top:9px;width:auto}.vp-preview span{margin-top:18px}.uploader-videopress{margin:16px}.uploader-videopress .videopress-errors div{margin:16px 0} \ No newline at end of file