Merge pull request #1643 from rtMediaWP/develop

Version update v4.6.3
rtCamp · Apr 30, 2020 · 5363270 · 5363270
2 parents 1a7a537 + 694cd71
commit 5363270
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -147,6 +147,13 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
+### 4.6.3 [April 30, 2020] ###
+
+* FIXED
+	* Conflict with Yoast SEO plugin
+	* Wrong Date/Time stamp for media
+	* Printing JavaScript code as text when Social Sync addon is active
+
 ### 4.6.2 [April 22, 2020] ###
 
 * FIXED

diff --git a/app/main/RTMedia.php b/app/main/RTMedia.php
@@ -1746,6 +1746,14 @@ public static function expanded_allowed_tags() {
 			'id'    => array(),
 		);
 
+		// Script, for social sync plugin.
+		$new_allowed['script'] = array(
+			'type'  => array(),
+			'class' => array(),
+			'id'    => array(),
+			'src'   => array(),
+		);
+
 		// form input.
 		$new_allowed['form'] = array(
 			'action' => array(),

diff --git a/app/main/controllers/template/rtmedia-functions.php b/app/main/controllers/template/rtmedia-functions.php
@@ -3303,9 +3303,11 @@ function rtmedia_convert_date( $_date ) {
 	$length    = array( 1, 60, 3600, 86400 );
 	// translators: %s: count of hour/minute/second.
 	$ago_text = esc_html__( '%s ago ', 'buddypress-media' );
-	$no       = 0;
 
-	for ( $i = count( $length ) - 1; ( $i >= 0 ) && ( $no <= 1 ); $i-- ) {
+	$i  = count( $length ) - 1;
+	$no = $diff / $length[ $i ];
+	while ( $i >= 0 && $no <= 1 ) {
+		$i--;
 		$no = $diff / $length[ $i ];
 	}
 

diff --git a/app/main/interactions/RTMediaInteraction.php b/app/main/interactions/RTMediaInteraction.php
@@ -52,7 +52,7 @@ public function __construct() {
 
 		add_filter( 'wp_title', array( $this, 'set_title' ), 99999, 2 );
 		add_filter( 'wpseo_opengraph_title', array( $this, 'set_title' ), 9999, 1 );
-		add_filter( 'wpseo_opengraph', array( $this, 'rtmedia_wpseo_og_image' ), 999, 1 );
+		add_filter( 'wpseo_frontend_presenters', array( $this, 'rtmedia_wpseo_og_image' ), 999, 1 );
 		add_filter( 'wpseo_opengraph_url', array( $this, 'rtmedia_wpseo_og_url' ), 999, 1 );
 		add_filter( 'wpseo_opengraph_desc', array( $this, 'rtmedia_wpseo_og_desc' ), 999, 1 );
 	}

diff --git a/index.php b/index.php
@@ -3,7 +3,7 @@
   Plugin Name: rtMedia for WordPress, BuddyPress and bbPress
   Plugin URI: https://rtmedia.io/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
   Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
-  Version: 4.6.2
+  Version: 4.6.3
   Author: rtCamp
   Text Domain: buddypress-media
   Author URI: http://rtcamp.com/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
@@ -21,7 +21,7 @@
 	/**
 	 * The version of the plugin
 	 */
-	define( 'RTMEDIA_VERSION', '4.6.2' );
+	define( 'RTMEDIA_VERSION', '4.6.3' );
 }
 
 if ( ! defined( 'RTMEDIA_PATH' ) ) {

diff --git a/languages/buddypress-media.po b/languages/buddypress-media.po
@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the rtMedia for WordPress, BuddyPress and bbPress package.
 msgid ""
 msgstr ""
-"Project-Id-Version: rtMedia for WordPress, BuddyPress and bbPress 4.6.2\n"
+"Project-Id-Version: rtMedia for WordPress, BuddyPress and bbPress 4.6.3\n"
 "Report-Msgid-Bugs-To: https://rtmedia.io/support/\n"
-"POT-Creation-Date: 2020-04-22 11:49:33+00:00\n"
+"POT-Creation-Date: 2020-04-30 10:14:18+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +146,7 @@ msgstr ""
 #: app/admin/RTMediaAdmin.php:805 app/admin/RTMediaAdmin.php:1355
 #: app/admin/RTMediaAdmin.php:1356 app/importers/RTMediaActivityUpgrade.php:188
 #: app/importers/RTMediaMigration.php:92 app/main/RTMedia.php:1208
-#: app/main/RTMedia.php:2077
+#: app/main/RTMedia.php:2085
 msgid "rtMedia"
 msgstr ""
 
@@ -3185,12 +3185,12 @@ msgid "Delete Album"
 msgstr ""
 
 #: app/main/controllers/template/rtmedia-filters.php:918
-#: app/main/controllers/template/rtmedia-functions.php:4631
+#: app/main/controllers/template/rtmedia-functions.php:4633
 msgid "rtMedia Shortcode Uploads"
 msgstr ""
 
 #: app/main/controllers/template/rtmedia-filters.php:922
-#: app/main/controllers/template/rtmedia-functions.php:4513
+#: app/main/controllers/template/rtmedia-functions.php:4515
 msgid "rtMedia Activities"
 msgstr ""
 
@@ -3199,12 +3199,12 @@ msgid "rtMedia Comments"
 msgstr ""
 
 #: app/main/controllers/template/rtmedia-filters.php:930
-#: app/main/controllers/template/rtmedia-functions.php:4858
+#: app/main/controllers/template/rtmedia-functions.php:4860
 msgid "rtMedia Media Views"
 msgstr ""
 
 #: app/main/controllers/template/rtmedia-filters.php:934
-#: app/main/controllers/template/rtmedia-functions.php:4959
+#: app/main/controllers/template/rtmedia-functions.php:4961
 msgid "rtMedia Media Likes"
 msgstr ""
 
@@ -3302,84 +3302,84 @@ msgstr ""
 msgid "%s ago "
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:3323
+#: app/main/controllers/template/rtmedia-functions.php:3325
 #. translators: %s: number of seconds.
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/main/controllers/template/rtmedia-functions.php:3328
+#: app/main/controllers/template/rtmedia-functions.php:3330
 #. translators: %s: number of minutes.
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/main/controllers/template/rtmedia-functions.php:3333
+#: app/main/controllers/template/rtmedia-functions.php:3335
 #. translators: %s: number of hours.
 msgid "%s hour"
 msgid_plural "%s hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/main/controllers/template/rtmedia-functions.php:3960
+#: app/main/controllers/template/rtmedia-functions.php:3962
 #. translators: %s: date format, see http:php.net/date.
 msgid "View Conversation"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4539
+#: app/main/controllers/template/rtmedia-functions.php:4541
 msgid "Activity Date"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4543
+#: app/main/controllers/template/rtmedia-functions.php:4545
 msgid "Activity Content"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4547
-#: app/main/controllers/template/rtmedia-functions.php:4768
+#: app/main/controllers/template/rtmedia-functions.php:4549
+#: app/main/controllers/template/rtmedia-functions.php:4770
 msgid "Attachments"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4640
+#: app/main/controllers/template/rtmedia-functions.php:4642
 msgid "Media Upload Date"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4644
+#: app/main/controllers/template/rtmedia-functions.php:4646
 msgid "Media Title"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4648
-#: app/main/controllers/template/rtmedia-functions.php:4862
-#: app/main/controllers/template/rtmedia-functions.php:4963
+#: app/main/controllers/template/rtmedia-functions.php:4650
+#: app/main/controllers/template/rtmedia-functions.php:4864
+#: app/main/controllers/template/rtmedia-functions.php:4965
 msgid "Media URL"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4652
+#: app/main/controllers/template/rtmedia-functions.php:4654
 msgid "Album Title"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4740
+#: app/main/controllers/template/rtmedia-functions.php:4742
 msgid "rtMedia Activity Comments"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4760
+#: app/main/controllers/template/rtmedia-functions.php:4762
 msgid "Comment Date"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4764
+#: app/main/controllers/template/rtmedia-functions.php:4766
 msgid "Comment Content"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4866
+#: app/main/controllers/template/rtmedia-functions.php:4868
 msgid "Number of Views"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4870
+#: app/main/controllers/template/rtmedia-functions.php:4872
 msgid "Date of First View"
 msgstr ""
 
-#: app/main/controllers/template/rtmedia-functions.php:4967
+#: app/main/controllers/template/rtmedia-functions.php:4969
 msgid "Date"
 msgstr ""
 

diff --git a/readme.txt b/readme.txt
@@ -134,6 +134,14 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Changelog ==
 
+= 4.6.3 [April 30, 2020] =
+
+* FIXED
+
+ * Conflict with Yoast SEO plugin
+ * Wrong Date/Time stamp for media
+ * Printing JavaScript code as text when Social Sync addon is active
+
 = 4.6.2 [April 22, 2020] =
 
 * FIXED
@@ -1685,8 +1693,8 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Upgrade Notice ==
 
-= 4.6.2 =
-rtMedia 4.6.2 with added fixes for preview not loading of docs and files in lightbox, privacy page redirection on user's profile along with warnings and PHP errors
+= 4.6.3 =
+rtMedia 4.6.3 with added fix for fatal errors issue with Yoast plugin along with the missing timestamp of media and added script tag for rtMedia social sync add-on
 
 == Sponsors ==