Skip to content
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

Jump to bottom

Error notices fixes #104

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Error notices fixes #104

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
4 changes: 4 additions & 0 deletions assets/dist/js/notices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
return 'error';
}

if (jqNotice.hasClass('error')) {
return 'error';
}

if (jqNotice.hasClass('notice-info') || jqNotice.hasClass('notice-information')) {
return 'information';
}
Expand Down
1 change: 0 additions & 1 deletion assets/dist/js/notices.min.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions bin/create-builds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ freeVersion() {
# ./bin/make-pot.sh
# ./bin/substitute-year.sh
# ./bin/set-free-version.sh

composer update --no-dev

rm -rf bin php-scoper scoper.inc.php third-party/woocommerce
rm -rf assets/css/
Expand Down
4 changes: 2 additions & 2 deletions includes/classes/class-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ public static function init() {
* @return array
*/
public static function get_settings() {
return wp_parse_args(
get_option( self::$option_name, array() ),
return \wp_parse_args(
\get_option( self::$option_name, array() ),
array(
'success_level_notices' => 'popup-only',
'error_level_notices' => 'popup-only',
Expand Down
2 changes: 2 additions & 0 deletions includes/functions/core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ function admin_scripts() {
esc_html__( 'User removed from this site.' ),
esc_html__( "You can't remove the current user." ),
esc_html__( 'Other users have been removed.' ),
esc_html__( 'Please enter a nickname.' ),
esc_html__( 'Please enter an email address.' ),

// Themes.
esc_html__( 'The active theme is broken. Reverting to the default theme.' ),
Expand Down
Loading