Completed
Push — master ( ffe98c...4b0354 )
by frank
01:54
created
classlesses/autoptimizeExtra.php 1 patch
Spacing   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
2
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
3 3
 
4 4
 // initialize
5
-if ( is_admin() ) {
6
-    add_action( 'admin_menu', 'autoptimize_extra_admin' );
7
-    add_filter( 'autoptimize_filter_settingsscreen_tabs','add_autoptimize_extra_tab' );
5
+if (is_admin()) {
6
+    add_action('admin_menu', 'autoptimize_extra_admin');
7
+    add_filter('autoptimize_filter_settingsscreen_tabs', 'add_autoptimize_extra_tab');
8 8
 } else {
9 9
     autoptimize_extra_init();
10 10
 }
11 11
 
12 12
 // get option
13 13
 function autoptimize_extra_get_options() {
14
-    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0","autoptimize_extra_checkbox_field_0"=>"0","autoptimize_extra_radio_field_4"=>"1","autoptimize_extra_text_field_2"=>"","autoptimize_extra_text_field_3"=>"");
15
-    $_option_val = get_option( 'autoptimize_extra_settings' );
14
+    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0", "autoptimize_extra_checkbox_field_0"=>"0", "autoptimize_extra_radio_field_4"=>"1", "autoptimize_extra_text_field_2"=>"", "autoptimize_extra_text_field_3"=>"");
15
+    $_option_val = get_option('autoptimize_extra_settings');
16 16
     if (empty($_option_val)) {
17 17
         $_option_val = $_default_val;
18 18
     }
@@ -24,69 +24,69 @@  discard block
 block discarded – undo
24 24
     $autoptimize_extra_options = autoptimize_extra_get_options();
25 25
 
26 26
     /* disable emojis */
27
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) ) {
27
+    if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1'])) {
28 28
         autoptimize_extra_disable_emojis();
29 29
     }
30 30
     
31 31
     /* remove version from query string */
32
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) ) {
33
-        add_filter( 'script_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
34
-        add_filter( 'style_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
32
+    if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0'])) {
33
+        add_filter('script_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
34
+        add_filter('style_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
35 35
     }
36 36
 
37 37
     /* async JS */
38 38
     if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_3'])) {
39
-        add_filter('autoptimize_filter_js_exclude','autoptimize_extra_async_js',10,1);
39
+        add_filter('autoptimize_filter_js_exclude', 'autoptimize_extra_async_js', 10, 1);
40 40
     }
41 41
 
42 42
     /* optimize google fonts */
43
-    if ( !empty( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] ) && ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1" ) ) {
44
-        if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2" ) {
45
-            add_filter('autoptimize_filter_css_removables','autoptimize_extra_remove_gfonts',10,1);
43
+    if (!empty($autoptimize_extra_options['autoptimize_extra_radio_field_4']) && ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1")) {
44
+        if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2") {
45
+            add_filter('autoptimize_filter_css_removables', 'autoptimize_extra_remove_gfonts', 10, 1);
46 46
         } else {
47
-            add_filter('autoptimize_html_after_minify','autoptimize_extra_gfonts',10,1);
48
-            add_filter('autoptimize_extra_filter_tobepreconn','autoptimize_extra_preconnectgooglefonts',10,1);
47
+            add_filter('autoptimize_html_after_minify', 'autoptimize_extra_gfonts', 10, 1);
48
+            add_filter('autoptimize_extra_filter_tobepreconn', 'autoptimize_extra_preconnectgooglefonts', 10, 1);
49 49
         }
50 50
     }
51 51
     
52 52
     /* preconnect */
53
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn') ) {
54
-        add_filter( 'wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2 );
53
+    if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
54
+        add_filter('wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2);
55 55
     }
56 56
 }
57 57
 
58 58
 // disable emoji's functions
59 59
 function autoptimize_extra_disable_emojis() {
60 60
     // all actions related to emojis
61
-    remove_action( 'admin_print_styles', 'print_emoji_styles' );
62
-    remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
63
-    remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
64
-    remove_action( 'wp_print_styles', 'print_emoji_styles' );
65
-    remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
66
-    remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
67
-    remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
61
+    remove_action('admin_print_styles', 'print_emoji_styles');
62
+    remove_action('wp_head', 'print_emoji_detection_script', 7);
63
+    remove_action('admin_print_scripts', 'print_emoji_detection_script');
64
+    remove_action('wp_print_styles', 'print_emoji_styles');
65
+    remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
66
+    remove_filter('the_content_feed', 'wp_staticize_emoji');
67
+    remove_filter('comment_text_rss', 'wp_staticize_emoji');
68 68
 
69 69
     // filter to remove TinyMCE emojis
70
-    add_filter( 'tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce' );
70
+    add_filter('tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce');
71 71
 
72 72
     // and remove dns-prefetch for emoji
73
-    add_filter( 'wp_resource_hints', 'disable_emojis_remove_dns_prefetch', 10, 2 );
73
+    add_filter('wp_resource_hints', 'disable_emojis_remove_dns_prefetch', 10, 2);
74 74
 }
75 75
 
76
-function autoptimize_extra_disable_emojis_tinymce( $plugins ) {
77
-    if ( is_array( $plugins ) ) {
78
-        return array_diff( $plugins, array( 'wpemoji' ) );
76
+function autoptimize_extra_disable_emojis_tinymce($plugins) {
77
+    if (is_array($plugins)) {
78
+        return array_diff($plugins, array('wpemoji'));
79 79
     } else {
80 80
         return array();
81 81
     }
82 82
 }
83 83
 
84
-function disable_emojis_remove_dns_prefetch( $urls, $relation_type ) {
85
-    if ( 'dns-prefetch' == $relation_type ) {
86
-        $_count=0;
87
-        $_emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
84
+function disable_emojis_remove_dns_prefetch($urls, $relation_type) {
85
+    if ('dns-prefetch' == $relation_type) {
86
+        $_count = 0;
87
+        $_emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
88 88
         foreach ($urls as $_url) {
89
-            if ( strpos($_url,$_emoji_svg_url) !== false ) {
89
+            if (strpos($_url, $_emoji_svg_url) !== false) {
90 90
                 unset($urls[$_count]);
91 91
             }
92 92
             $_count++;
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 }
98 98
 
99 99
 // remove query string function
100
-function autoptimize_extra_remove_qs( $src ) {
101
-    if ( strpos($src, '?ver=') ) {
102
-            $src = remove_query_arg( 'ver', $src );
100
+function autoptimize_extra_remove_qs($src) {
101
+    if (strpos($src, '?ver=')) {
102
+            $src = remove_query_arg('ver', $src);
103 103
     }
104 104
     return $src;
105 105
 }
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
     // get exclusions
112 112
     $AO_JSexclArrayIn = array();
113 113
     if (!empty($in)) {
114
-        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim',explode(",",$in))),"");
114
+        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim', explode(",", $in))), "");
115 115
     }
116 116
     
117 117
     // get asyncs
118 118
     $_fromSetting = $autoptimize_extra_options['autoptimize_extra_text_field_3'];
119
-    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim',explode(",",$_fromSetting))),"");
119
+    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim', explode(",", $_fromSetting))), "");
120 120
     foreach ($AO_asynced_JS as $JSkey => $JSvalue) {
121 121
         $AO_asynced_JS[$JSkey] = "async";
122 122
     }
123 123
     
124 124
     // merge exclusions & asyncs in one array and return to AO API
125
-    $AO_excl_w_async = array_merge( $AO_JSexclArrayIn, $AO_asynced_JS );
125
+    $AO_excl_w_async = array_merge($AO_JSexclArrayIn, $AO_asynced_JS);
126 126
     return $AO_excl_w_async;
127 127
 }
128 128
 
@@ -131,25 +131,25 @@  discard block
 block discarded – undo
131 131
     $autoptimize_extra_options = autoptimize_extra_get_options();
132 132
     
133 133
     // get setting and store in array
134
-    $_to_be_preconnected = array_filter(array_map('trim',explode(",",$autoptimize_extra_options['autoptimize_extra_text_field_2'])));
135
-    $_to_be_preconnected = apply_filters( 'autoptimize_extra_filter_tobepreconn', $_to_be_preconnected );
134
+    $_to_be_preconnected = array_filter(array_map('trim', explode(",", $autoptimize_extra_options['autoptimize_extra_text_field_2'])));
135
+    $_to_be_preconnected = apply_filters('autoptimize_extra_filter_tobepreconn', $_to_be_preconnected);
136 136
 
137 137
     // walk array, extract domain and add to new array with crossorigin attribute
138 138
     foreach ($_to_be_preconnected as $_preconn_single) {
139 139
         $_preconn_parsed = parse_url($_preconn_single);
140 140
         
141
-        if ( is_array($_preconn_parsed) && empty($_preconn_parsed['scheme']) ) {
141
+        if (is_array($_preconn_parsed) && empty($_preconn_parsed['scheme'])) {
142 142
             $_preconn_domain = "//".$_preconn_parsed['host'];
143
-        } else if ( is_array($_preconn_parsed) ) {
143
+        } else if (is_array($_preconn_parsed)) {
144 144
             $_preconn_domain = $_preconn_parsed['scheme']."://".$_preconn_parsed['host'];
145 145
         }
146 146
         
147
-        if ( !empty($_preconn_domain) ) {
147
+        if (!empty($_preconn_domain)) {
148 148
             $_preconn_hint = array('href' => $_preconn_domain);
149 149
             // fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set
150 150
             // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed
151
-            $_preconn_crossorigin = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com') );
152
-            if ( in_array( $_preconn_domain, $_preconn_crossorigin ) ) {
151
+            $_preconn_crossorigin = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
152
+            if (in_array($_preconn_domain, $_preconn_crossorigin)) {
153 153
                 $_preconn_hint['crossorigin'] = 'anonymous';
154 154
             }
155 155
             $_new_hints[] = $_preconn_hint;
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
     }
158 158
 
159 159
     // merge in wordpress' preconnect hints
160
-    if ( 'preconnect' === $relation_type && !empty($_new_hints) ) {
160
+    if ('preconnect' === $relation_type && !empty($_new_hints)) {
161 161
         $hints = array_merge($hints, $_new_hints);      
162 162
     }
163 163
     
@@ -174,48 +174,48 @@  discard block
 block discarded – undo
174 174
     $autoptimize_extra_options = autoptimize_extra_get_options();
175 175
     
176 176
     // extract fonts, partly based on wp rocket's extraction code
177
-    $_without_comments = preg_replace( '/<!--(.*)-->/Uis', '', $in );
178
-    preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $_without_comments, $matches );
177
+    $_without_comments = preg_replace('/<!--(.*)-->/Uis', '', $in);
178
+    preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $_without_comments, $matches);
179 179
 
180 180
     $i = 0;
181 181
     $fontsCollection = array();
182
-    if ( ! $matches[2] ) {
182
+    if (!$matches[2]) {
183 183
         return $in;
184 184
     }
185 185
     
186 186
     // store them in $fonts array
187
-    foreach ( $matches[2] as $font ) {
188
-        if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) {
187
+    foreach ($matches[2] as $font) {
188
+        if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) {
189 189
             // Get fonts name.
190
-            $font = str_replace( array( '%7C', '%7c' ) , '|', $font );
191
-            $font = explode( 'family=', $font );
192
-            $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
190
+            $font = str_replace(array('%7C', '%7c'), '|', $font);
191
+            $font = explode('family=', $font);
192
+            $font = (isset($font[1])) ? explode('&', $font[1]) : array();
193 193
             // Add font to $fonts[$i] but make sure not to pollute with an empty family
194
-            $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) );
195
-            if ( !empty($_thisfont) ) {
194
+            $_thisfont = array_values(array_filter(explode('|', reset($font))));
195
+            if (!empty($_thisfont)) {
196 196
                 $fontsCollection[$i]["fonts"] = $_thisfont;
197 197
                 // And add subset if any
198
-                $subset = ( is_array( $font ) ) ? end( $font ) : '';
199
-                if ( false !== strpos( $subset, 'subset=' ) ) {
200
-                    $subset = explode( 'subset=', $subset );
201
-                    $fontsCollection[$i]["subsets"] = explode( ',', $subset[1] );
198
+                $subset = (is_array($font)) ? end($font) : '';
199
+                if (false !== strpos($subset, 'subset=')) {
200
+                    $subset = explode('subset=', $subset);
201
+                    $fontsCollection[$i]["subsets"] = explode(',', $subset[1]);
202 202
                 }
203 203
             }
204 204
             // And remove Google Fonts.
205
-            $in = str_replace( $matches[0][ $i ], '', $in );
205
+            $in = str_replace($matches[0][$i], '', $in);
206 206
         }
207 207
         $i++;
208 208
     }
209 209
 
210
-    $_fontsOut="";
211
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3" ) {
210
+    $_fontsOut = "";
211
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3") {
212 212
         // aggregate & link
213
-        $_fontsString="";
214
-        $_subsetString="";
213
+        $_fontsString = "";
214
+        $_subsetString = "";
215 215
         foreach ($fontsCollection as $font) {
216
-            $_fontsString .= '|'.trim( implode( '|' , $font["fonts"] ), '|' );
217
-            if ( !empty( $font["subsets"] ) ) {
218
-                $_subsetString .= implode( ',', $font["subsets"] ); 
216
+            $_fontsString .= '|'.trim(implode('|', $font["fonts"]), '|');
217
+            if (!empty($font["subsets"])) {
218
+                $_subsetString .= implode(',', $font["subsets"]); 
219 219
             }
220 220
         }
221 221
                     
@@ -223,17 +223,17 @@  discard block
 block discarded – undo
223 223
             $_fontsString = $_fontsString."#038;subset=".$_subsetString;
224 224
         }
225 225
 
226
-        $_fontsString = str_replace( '|', '%7C', ltrim($_fontsString,'|') );
226
+        $_fontsString = str_replace('|', '%7C', ltrim($_fontsString, '|'));
227 227
         
228
-        if ( ! empty( $_fontsString ) ) {
229
-            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $_fontsString . '" />';
228
+        if (!empty($_fontsString)) {
229
+            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$_fontsString.'" />';
230 230
         }
231
-    } else if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
231
+    } else if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
232 232
         // aggregate & load async (webfont.js impl.)
233 233
         $_fontsArray = array();
234 234
         foreach ($fontsCollection as $_fonts) {
235
-            if ( !empty( $_fonts["subsets"] ) ) {
236
-                $_subset = implode(",",$_fonts["subsets"]);
235
+            if (!empty($_fonts["subsets"])) {
236
+                $_subset = implode(",", $_fonts["subsets"]);
237 237
                 foreach ($_fonts["fonts"] as $key => $_one_font) {
238 238
                     $_one_font = $_one_font.":".$_subset;
239 239
                     $_fonts["fonts"][$key] = $_one_font;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
         foreach ($_fontsArray as $_font) {
247 247
             $_fontsOut .= $_font."','";
248 248
         }
249
-        $_fontsOut = trim(trim($_fontsOut,"'"),",");
249
+        $_fontsOut = trim(trim($_fontsOut, "'"), ",");
250 250
         $_fontsOut .= '] },classes:false, events:false, timeout:1500};(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
251 251
     }
252 252
  
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
     // preconnect to fonts.gstatic.com speed up download of static font-files
262 262
     $in[] = "https://fonts.gstatic.com";
263
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
263
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
264 264
         // and more preconnects for webfont.js
265 265
         $in[] = "https://ajax.googleapis.com/";
266 266
         $in[] = "https://fonts.googleapis.com";
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 
271 271
 /* admin page functions */
272 272
 function autoptimize_extra_admin() { 
273
-    add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page' );
274
-    register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
273
+    add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page');
274
+    register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
275 275
 }
276 276
 
277 277
 function add_autoptimize_extra_tab($in) {
278
-    $in=array_merge($in,array('autoptimize_extra' => __('Extra','autoptimize')));
278
+    $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
279 279
     return $in;
280 280
 }
281 281
 
@@ -289,46 +289,46 @@  discard block
 block discarded – undo
289 289
         #autoptimize_extra_descr{font-size: 120%;}
290 290
     </style>
291 291
     <div class="wrap">
292
-    <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
292
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
293 293
     <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
294 294
     <form id='ao_settings_form' action='options.php' method='post'>
295 295
         <?php settings_fields('autoptimize_extra_settings'); ?>
296
-        <h2><?php _e('Extra Auto-Optimizations','autoptimize'); ?></h2>
297
-        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.','autoptimize'); ?></span>
296
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
297
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
298 298
         <table class="form-table">
299 299
             <tr>
300
-                <th scope="row"><?php _e('Remove emojis','autoptimize'); ?></th>
300
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
301 301
                 <td>
302
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) echo 'checked="checked"'; ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.','autoptimize'); ?></label>
302
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) echo 'checked="checked"'; ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
303 303
                 </td>
304 304
             </tr>
305 305
             <tr>
306
-                <th scope="row"><?php _e('Remove query strings from static resources','autoptimize'); ?></th>
306
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
307 307
                 <td>
308
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty( $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) echo 'checked="checked"'; ?> value='1'><?php _e('Removing query strings (or more specificaly the <code>ver</code> parameter) will not improve load time, but might improve performance scores.','autoptimize'); ?></label>
308
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) echo 'checked="checked"'; ?> value='1'><?php _e('Removing query strings (or more specificaly the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
309 309
                 </td>
310 310
             </tr>
311 311
             <tr>
312
-                <th scope="row"><?php _e('Google Fonts','autoptimize'); ?></th>
312
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
313 313
                 <td>
314
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($_googlef,array(2,3,4))) {echo "checked"; } ?> ><?php _e('Leave as is','autoptimize'); ?><br/>
315
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $_googlef, true); ?> ><?php _e('Remove Google Fonts','autoptimize'); ?><br/>
316
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head','autoptimize'); ?><br/>
317
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>','autoptimize'); ?><br/>
314
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($_googlef, array(2, 3, 4))) {echo "checked"; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/>
315
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $_googlef, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
316
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head', 'autoptimize'); ?><br/>
317
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/>
318 318
                 </td>
319 319
             </tr>
320 320
             <tr>
321
-                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>','autoptimize'); ?></th>
321
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
322 322
                 <td>
323
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_2']; ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).','autoptimize'); ?></label>
323
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_2']; ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
324 324
                 </td>
325 325
             </tr>
326 326
             <tr>
327
-                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>','autoptimize'); ?></th>
327
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
328 328
                 <td>
329 329
                     <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_3']; ?>'>
330 330
                     <br />
331
-                    <?php _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here.','autoptimize'); ?>
331
+                    <?php _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here.', 'autoptimize'); ?>
332 332
                 </td>
333 333
             </tr>
334 334
         </table>
Please login to merge, or discard this patch.