Merge pull request #1604 from rtMediaWP/develop

Version update v4.6.1

Author: thrijith

README.md

@@ -147,7 +147,7 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
-### 4.6.1 [April 8, 2020] ###
+### 4.6.1 [April 9, 2020] ###
 
 * Enhancement
 	* Disable the terms of service checkbox when the activity is published

app/assets/js/rtm-upload-terms.js

@@ -15,10 +15,14 @@ if ( 'object' === typeof rtMediaHook ) {
      * @return {boolean}
      */
     rtMediaHook.register( 'rtmedia_js_before_upload', function ( args ) {
-        if ( false === args || 'undefined' === typeof args.uploader.settings.multipart_params || 'undefined' === typeof args.src ) {
+        if ( ! args ) {
             return args;
         }
 
+        if ( 'undefined' === typeof args.uploader || 'undefined' === typeof args.uploader.settings || 'undefined' === typeof args.uploader.settings.multipart_params || 'undefined' === typeof args.src ) {
+            return ( 'boolean' === typeof args ? args : true );
+        }
+
         var multipart_params = args.uploader.settings.multipart_params;
         var request_key = false;
         var terms_key = false;
@@ -72,7 +76,7 @@ if ( 'object' === typeof rtMediaHook ) {
      * @return {boolean}
      */
     rtMediaHook.register( 'rtmedia_js_upload_file', function ( args ) {
-        if ( false === args ) {
+        if ( ! args ) {
             return args;
         }
 
@@ -120,7 +124,7 @@ if ( 'object' === typeof rtMediaHook ) {
         }
 
         if ( ! isTermsEnabled ) {
-            return args;
+            return ( 'boolean' === typeof args ? args : true );
         }
 
         if ( 0 === terms.length ) {

app/assets/js/rtm-upload-terms.min.js

@@ -1,6 +1,6 @@
 dist: xenial
 language: php
-sudo: required
+os: linux
 php:
   - 7.2
 branches:

bin/.travis.yml

@@ -134,7 +134,7 @@ http://www.youtube.com/watch?v=dJrykKQGDcs
 
 == Changelog ==
 
-= 4.6.1 [April 8, 2020] =
+= 4.6.1 [April 9, 2020] =
 
 * Enhancement