Changeset 908117

Timestamp:

05/05/2014 09:36:56 AM (12 years ago)

Author:

faishal

Message:

version 3.6.14 released

Location:

buddypress-media/trunk

Files:

• app/assets/js/rtMedia.js (modified) (1 diff)
• app/main/controllers/privacy/RTMediaPrivacy.php (modified) (1 diff)
• index.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

buddypress-media/trunk/app/assets/js/rtMedia.js

@@ -405 +405 @@
 
     function rtmedia_disable_popup_navigation_comment_focus() {
-        jQuery('#comment_content').live('focusin',function(){
+        jQuery(document).on('focusin','#comment_content', function(){
             jQuery(document).unbind('keydown');
         });
-        jQuery('#comment_content').live('focusout',function(){
+        jQuery(document).on('focusout','#comment_content',function(){
             var rtm_mfp = jQuery.magnificPopup.instance;
             jQuery(document).on('keydown',function(e) {

buddypress-media/trunk/app/main/controllers/privacy/RTMediaPrivacy.php

@@ -23 +23 @@
             //add_action ( 'rtmedia_after_file_upload_ui' , array ( $this , 'uploader_privacy_ui' ) ) ;
             //add_action ( 'rtmedia_add_edit_fields' , array ( $this , 'edit_media_privacy_ui' ),2 ) ;
-            add_action ( 'bp_init' , array ( $this , 'add_nav' ) ) ;
-            add_action ( 'bp_template_content' , array ( $this , 'content' ) ) ;
-            add_filter ( 'bp_activity_get_user_join_filter' , array ( $this , 'activity_privacy' ) , 10 , 6 ) ;
-        }
-    }
+            add_action ( 'bp_init' , array( $this , 'add_nav' ) ) ;
+            add_action ( 'bp_template_content' , array( $this , 'content' ) ) ;
+            add_filter ( 'bp_activity_get_user_join_filter' , array( $this , 'activity_privacy' ), 10, 6 ) ;
+            add_filter ( 'bp_use_legacy_activity_query' , array( $this , 'enable_buddypress_privacy' ), 10, 3 ) ;
+        }
+    }
+
+    function enable_buddypress_privacy( $flag, $method, $func_args ) {
+        global $rtmedia;
+        $option = $rtmedia->options;
+        if( isset( $option['privacy_enabled'] ) && $option['privacy_enabled'] != '0' ) {
+            if( $method == "BP_Activity_Activity::get" ) {
+                $flag = true;
+            }
+        }
+        return $flag;
+    }
 
     function edit_media_privacy_ui($echo = true) {

buddypress-media/trunk/index.php

@@ -5 +5 @@
   Plugin URI: http://rtcamp.com/buddypress-media/?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: 3.6.13
+  Version: 3.6.14
   Author: rtCamp
   Text Domain: rtmedia

buddypress-media/trunk/readme.txt

@@ -7 +7 @@
 Requires at least: WordPress 3.6
 Tested up to: WordPress 3.9 + BuddyPress 2.0
-Stable tag: 3.6.13
+Stable tag: 3.6.14
 
 Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
@@ -134 +134 @@
 Please visit [rtMedia's Roadmap page](http://rtcamp.com/rtmedia/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit rtMedia's Features page") to get some details about future releases.
 
+= 3.6.14 =
+* Fix BuddyPress privacy issue
+
 = 3.6.13 =
 * Media template update
@@ -750 +753 @@
 == Upgrade Notice ==
 
-= 3.6.13 =
-Requires BuddyPress 1.7 or higher, if using BuddyPress. Media template update, translation update, bug fixes
+= 3.6.14 =
+Requires BuddyPress 1.7 or higher, if using BuddyPress. Fix BuddyPress privacy issue.
 
 == Sponsors ==