| @@ -34,9 +34,9 @@ | ||
| 34 | 34 | $message = __( sprintf("No Handler found for action %s ", $plugin_action), 'maxbuttons'); |
| 35 | 35 | |
| 36 | 36 | if (! wp_verify_nonce($nonce, 'maxajax') ) |
| 37 | 37 | { |
| 38 | - $message = __('Nonce not verified (' . $nonce . ')', 'maxbuttons'); | |
| 38 | + $message = __('Nonce not verified', 'maxbuttons'); | |
| 39 | 39 | } |
| 40 | 40 | else |
| 41 | 41 | { |
| 42 | 42 | do_action('maxbuttons/ajax/' . $plugin_action, $_POST); |
| @@ -292,9 +292,8 @@ | ||
| 292 | 292 | |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | /** Function will try to unload any FA scripts other than MB from WP. In case of conflict */ |
| 296 | - /* 7.0 note - this function is currently not in use due to dynamic font library loading */ | |
| 297 | 296 | static function fixFAConflict() |
| 298 | 297 | { |
| 299 | 298 | $forcefa = get_option('maxbuttons_forcefa'); |
| 300 | 299 | |
| @@ -309,9 +308,8 @@ | ||
| 309 | 308 | { |
| 310 | 309 | if ($script == 'mbpro-font-awesome') |
| 311 | 310 | { |
| 312 | 311 | $our_fa_there = true; |
| 313 | - | |
| 314 | 312 | break; |
| 315 | 313 | } |
| 316 | 314 | } |
| 317 | 315 | |
| @@ -316,12 +314,11 @@ | ||
| 316 | 314 | } |
| 317 | 315 | |
| 318 | 316 | // fix nothing on pages where we are not loading. |
| 319 | 317 | if (! $our_fa_there) |
| 320 | - { | |
| 321 | 318 | return; |
| 322 | - } | |
| 323 | 319 | |
| 320 | + | |
| 324 | 321 | // Loop through all registered styles and remove any that appear to be Font Awesome. |
| 325 | 322 | foreach ( $wp_styles->registered as $script => $details ) { |
| 326 | 323 | $src = isset($details->src) ? $details->src : false; |
| 327 | 324 | |
| @@ -330,14 +327,11 @@ | ||
| 330 | 327 | $mbpro_src = $src; |
| 331 | 328 | continue; // exclude us |
| 332 | 329 | } |
| 333 | 330 | |
| 334 | - // look at script handle | |
| 335 | - | |
| 336 | 331 | if ( false !== strpos( $script, 'fontawesome' ) || false !== strpos( $script, 'font-awesome' ) ) { |
| 337 | 332 | wp_dequeue_style( $script ); |
| 338 | 333 | } |
| 339 | - // look at file source | |
| 340 | 334 | if ($src && ( false !== strpos($src, 'font-awesome') || false !== strpos($src, 'fontawesome') ) ) |
| 341 | 335 | { |
| 342 | 336 | wp_dequeue_style( $script ); |
| 343 | 337 | } |
