Skip to content

Fix page load warnings and dead GoDAM enqueue #2359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sanketio wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −5
Open

Fix page load warnings and dead GoDAM enqueue #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/importers/RTMediaMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ public function get_total_count() {
} else {
$bp_prefix = '';
}
$count = 0;

$sql_album_usercount = "select count(*) FROM $wpdb->usermeta where meta_key ='bp-media-default-album' ";

// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Direct query is required for custom table.
Expand Down
5 changes: 3 additions & 2 deletions app/main/RTMediaUploadTerms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function dynamic_sidebar_params( $params ) {
* Loads translation
*/
public function load_translation() {
load_plugin_textdomain( 'rtmedia', false, basename( RTMEDIA_PATH ) . '/languages/' );
load_plugin_textdomain( 'buddypress-media', false, basename( RTMEDIA_PATH ) . '/languages/' );
}

/**
Expand All @@ -97,7 +97,8 @@ public function enqueue_scripts_styles() {
global $rtmedia;

$suffix = ( function_exists( 'rtm_get_script_style_suffix' ) ) ? rtm_get_script_style_suffix() : '.min';
$general_upload_terms_error_message = apply_filters( 'rtmedia_upload_terms_check_terms_message', $rtmedia->options['general_upload_terms_error_message'] );
$upload_terms_error_message = isset( $rtmedia->options['general_upload_terms_error_message'] ) ? $rtmedia->options['general_upload_terms_error_message'] : '';
$general_upload_terms_error_message = apply_filters( 'rtmedia_upload_terms_check_terms_message', $upload_terms_error_message );

if ( ! ( isset( $rtmedia->options ) && isset( $rtmedia->options['styles_enabled'] ) && 0 === $rtmedia->options['styles_enabled'] ) ) {
wp_enqueue_style( 'rtmedia-upload-terms-main', RTMEDIA_URL . 'app/assets/css/rtm-upload-terms' . $suffix . '.css', '', RTMEDIA_VERSION );
Expand Down
5 changes: 2 additions & 3 deletions templates/media/godam-integration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
* - Enqueue Godam scripts and styles (including skins) on both normal pages and BuddyPress pages.
* - Replace rtMedia video lists in BuddyPress activity streams with Godam players.
* - Handle AJAX requests for activity comments to ensure Godam players load dynamically.
* - Ensure compatibility with multisite setups using `get_site_option` for global settings.
* - Maintain Magnific Popup compatibility when Godam is active or inactive.
*/

Expand All @@ -24,10 +23,10 @@ function godam_enqueue_player_assets() {
// Base scripts and styles
wp_enqueue_script( 'godam-player-frontend-script' );
wp_enqueue_script( 'godam-player-analytics-script' );
wp_enqueue_style( 'godam-player-frontend-style' );
wp_enqueue_style( 'godam-player-style' );

// Skin detection — multisite safe (uses site option).
// Skin detection. GoDAM stores this with get_option()/update_option(), so it is
// intentionally per-site and must not be read with get_site_option().
$godam_settings = get_option( 'rtgodam-settings', array() );
$selected_skin = $godam_settings['video_player']['player_skin'] ?? '';

Expand Down
Loading