Skip to content

Commit 3d3cd27

Browse files
Merge branch 'master' into 5.1.3
2 parents 2df5b37 + 09912b6 commit 3d3cd27

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

includes/admin/gutenberg-jalali-calendar.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function wpp_gutenberg_jalali_calendar_editor_assets() {
4242
'wp-data',
4343
'wp-date'
4444
),
45-
true
45+
WP_PARSI_VER
4646
);
4747

4848
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) || wpp_is_active( 'dev_mode' ) ? '' : '.min';
@@ -51,7 +51,7 @@ function wpp_gutenberg_jalali_calendar_editor_assets() {
5151
wp_enqueue_style(
5252
'wpp_gutenberg_jalali_calendar_editor_styles',
5353
WP_PARSI_URL . 'assets/css/gutenberg-jalali-calendar.build.css',
54-
array( 'wp-edit-blocks' )
54+
array( 'wp-edit-blocks' ), WP_PARSI_VER
5555
);
5656
}
5757
}

includes/admin/styles-fix.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ function wpp_fix_editor_rtl() {
3232
* @since 2.0
3333
*/
3434
function wpp_fix_tinymce_font() {
35-
if( wpp_is_active( 'enable_fonts' ) ){
36-
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) || wpp_is_active( 'dev_mode' ) ? '' : '.min';
37-
add_editor_style( WP_PARSI_URL . "assets/css/editor$suffix.css" );
38-
}
35+
if ( wpp_is_active( 'enable_fonts' ) ) {
36+
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) || wpp_is_active( 'dev_mode' ) ? '' : '.min';
37+
add_editor_style( WP_PARSI_URL . "assets/css/editor$suffix.css" );
38+
}
3939
}
4040

4141
add_filter( 'init', 'wpp_fix_tinymce_font', 9 );

includes/admin/widgets.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,10 @@ function wpp_enqueue_admin_dashboard_assets( $hook ) {
333333

334334
$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) || wpp_is_active( 'dev_mode' ) ? '' : '.min';
335335

336-
wp_enqueue_style( 'keen-slider', WP_PARSI_URL . "assets/css/keen-slider$suffix.css", false, '1.0.0' );
337-
wp_enqueue_style( 'wpp_dashboard', WP_PARSI_URL . "assets/css/dashboard$suffix.css", false, '1.0.0' );
338-
wp_enqueue_script( 'keen-slider', WP_PARSI_URL . "assets/js/keen-slider.min.js", array(), '1.6.0', true );
339-
wp_enqueue_script( 'wpp_dashboard', WP_PARSI_URL . "assets/js/dashboard$suffix.js", array( 'jquery', 'keen-slider' ), '1.0.0', true );
336+
wp_enqueue_style( 'keen-slider', WP_PARSI_URL . "assets/css/keen-slider$suffix.css", false, '6.8.6' );
337+
wp_enqueue_style( 'wpp_dashboard', WP_PARSI_URL . "assets/css/dashboard$suffix.css", false, WP_PARSI_VER );
338+
wp_enqueue_script( 'keen-slider', WP_PARSI_URL . "assets/js/keen-slider.min.js", array(), '6.8.6', true );
339+
wp_enqueue_script( 'wpp_dashboard', WP_PARSI_URL . "assets/js/dashboard$suffix.js", array( 'jquery', 'keen-slider' ), WP_PARSI_VER, true );
340340
}
341341

342342
add_action( 'admin_enqueue_scripts', 'wpp_enqueue_admin_dashboard_assets' );

includes/general.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ function wpp_login_headerurl() {
6868
function wpp_activation_notice() {
6969
$dismissed = get_option( 'wpp_dismissed', false );
7070

71-
if ( ! $dismissed && ( ! isset( $_GET['page'] ) || $_GET['page'] !== 'wp-parsi-settings' ) ) {
71+
if ( ! $dismissed && ( ! isset( $_GET['page'] ) || 'wp-parsi-settings' !== $_GET['page'] ) ) {
7272
if ( ! wpp_is_active( 'persian_date' ) ) {
73+
$dismiss_url = wp_nonce_url( add_query_arg( 'wpp-action', 'dismiss-notice' ), 'wpp_dismiss_notice' );
74+
7375
echo sprintf(
7476
__( '<div class="updated wpp-message"><p>ParsiDate activated, you may need to configure it to work properly. <a href="%s">Go to configuration page</a> &ndash; <a href="%s">Dismiss</a></p></div>', 'wp-parsidate' ),
75-
admin_url( 'admin.php?page=wp-parsi-settings' ),
76-
add_query_arg( 'wpp-action', 'dismiss-notice' )
77+
esc_url( admin_url( 'admin.php?page=wp-parsi-settings' ) ),
78+
esc_url( $dismiss_url ),
7779
);
7880
}
7981
}
@@ -89,6 +91,7 @@ function wpp_activation_notice() {
8991
*/
9092
function wpp_dismiss_notice_action() {
9193
if ( isset( $_GET['wpp-action'] ) && $_GET['wpp-action'] == 'dismiss-notice' ) {
94+
check_admin_referer( 'wpp_dismiss_notice' );
9295
update_option( 'wpp_dismissed', true );
9396
}
9497
}

readme.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Contributors: lord_viper, man4toman, parselearn, yazdaniwp, saeedfard, iehsanir
33
Donate link: https://wp-parsi.com/support/
44
Tags: shamsi, wp-parsi, wpparsi, persian, parsi, farsi, jalali, date, calendar, i18n, l10n, iran, iranian, parsidate, rtl, gutenberg, acf,woocommerce
55
Requires at least: 5.3
6-
Tested up to: 6.6.1
7-
Stable tag: 5.1.1
6+
Tested up to: 6.7.1
7+
Stable tag: 5.1.2
88

99
Persian date support for WordPress
1010

wp-parsidate.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/**
55
* Plugin Name: WP-Parsidate
6-
* Version: 5.1.1
6+
* Version: 5.1.2
77
* Plugin URI: https://wp-parsi.com/support/
88
* Description: Persian package for WordPress, Adds full RTL and Shamsi (Jalali) support for: posts, comments, pages, archives, search, categories, permalinks and all admin sections and TinyMce editor, lists, quick editor. This package has Jalali archive widget.
99
* Author: WP-Parsi Team
@@ -101,7 +101,7 @@ private function define_const() {
101101

102102
if ( ! defined( 'WP_PARSI_VER' ) ) {
103103
define( 'WP_PARSI_VER', '5.1.3' );
104-
}
104+
}
105105
}
106106

107107
/**

0 commit comments

Comments
 (0)