Plugin Directory

Changeset 1271293


Ignore:
Timestamp:
10/22/2015 06:54:48 PM (10 years ago)
Author:
NodeCode
Message:

tagging version 1.4.1

Location:
wp-minify-fix
Files:
5 edited
14 copied

Legend:

Unmodified
Added
Removed
  • wp-minify-fix/tags/1.4.1/min/lib/Minify/HTML.php

    r891097 r1271293  
    146146       
    147147        // use newlines before 1st attribute in open tags (to limit line lengths)
    148         $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
     148        //$this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
     149       
     150        // remove newlines
     151        $this->_html = str_replace("\n", ' ', $this->_html);
    149152       
    150153        // fill placeholders
  • wp-minify-fix/tags/1.4.1/options-generic.php

    r1081305 r1271293  
    115115        printf('
    116116            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    117             <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
    118             <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
    119             <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
     117            <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
     118            <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
     119            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
    120120            ',
    121121            __('Local Files Minification', $this->name),
     
    128128            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    129129            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
    130             <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
    131             <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
     130            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
     131            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
    132132            ',
    133133            __('Non-Local Files Minification', $this->name),
     
    144144        printf('
    145145            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    146             <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
     146            <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.esc_attr($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
    147147            ',
    148148            __('Caching', $this->name),
     
    188188        printf('
    189189            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
    190             <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
     190            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.esc_attr($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
    191191            ',
    192192            __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
  • wp-minify-fix/tags/1.4.1/readme.txt

    r1081305 r1271293  
    11=== WP Minify Fix ===
    2 Tags: minify, js, css, html, javascript, cascading style sheets, optimize, performance, speed, http request, phpspeedy, fix, compress, performance, import
     2Tags: minify, js, css, html, javascript, cascading style sheets, optimize, performance, performance optimization, optimize, optimizer, speed, http request, phpspeedy, fix, compress, performance, import, cache, combine, bundle, plugin, google page speed, nginx
    33Contributors: NodeCode, madeinthayaland
    4 Requires at least: 2.7
    5 Tested up to: 4.1
    6 Stable Tag: 1.4.0
     4Requires at least: 2.8
     5Tested up to: 4.3.1
     6Stable Tag: 1.4.1
    77
    88[Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files
     
    1212This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs and add features, because it has not been updated since 2012-6-4.
    1313
    14 This plugin integrates the [Minify engine](http://code.google.com/p/minify/)
     14This plugin integrates the [Minify engine](https://github.com/mrclay/minify)
    1515into your WordPress blog.  Once enabled, this plugin will combine and compress
    1616JS and CSS files to improve page load time.
     
    4848* Plugin hooks!
    4949
     50You can also commit changes on our [Github repository](https://github.com/nodecode/wp-minify-fix).
     51
    5052== Changelog ==
     53= 1.4.1 =
     54* Duplicate footer scripts bug fixed
     55* PHP warning message in some scenarios fixed
     56* Newlines before the first attribute in open tags removed
     57* Compatibility changes
     58
    5159= 1.4.0 =
    5260* Added option for the HTML5 async attribute
  • wp-minify-fix/tags/1.4.1/wp-minify.php

    r1081305 r1271293  
    44Plugin URI: http://wordpress.org/plugins/wp-minify-fixed/
    55Description: [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files to improve page load time.
    6 Version: 1.4.0
     6Version: 1.4.1
    77Author: NodeCode
    88Author URI: http://nodecode.de
     
    1010
    1111/*
    12 Copyright 2013 NodeCode (email: [email protected])
     12Copyright 2013-2015 NodeCode (email: [email protected])
    1313Copyright 2009-2011 Thaya Kareeson (email: [email protected])
    1414
     
    3535    var $name_proper = 'WP Minify Fix';
    3636    var $required_wp_version = '2.7';
    37     var $version = '1.4.0';
     37    var $version = '1.4.1';
    3838
    3939    var $c = null;
     
    474474            // append &debug if we need to
    475475            if ($wpm_options['debug_nominify']) {
    476                 $debug_string = '&amp;debug=true';
     476                $debug_string = '&debug=true';
    477477            } else {
    478478                $debug_string = '';
     
    482482            $base = $this->get_base();
    483483            if ($base != '') {
    484                 $base_string = '&amp;b='.$base;
     484                $base_string = '&b='.$base;
    485485            } else {
    486486                $base_string = '';
     
    490490            $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
    491491            if (trim($extra_minify_options) != '') {
    492                 $extra_string = '&amp;'.$extra_minify_options;
     492                $extra_string = '&'.$extra_minify_options;
    493493            } else {
    494494                $extra_string = '';
     
    496496
    497497            // append last modified time
    498             $latest_modified_string = '&amp;m='.$latest_modified;
     498            $latest_modified_string = '&m='.$latest_modified;
    499499
    500500            return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
     
    882882            }
    883883   
    884             $js_locations_footer = array_unique($js_locations_footer);
     884            if ($js_locations_footer != NULL)
     885                $js_locations_footer = array_unique($js_locations_footer);
    885886        }
    886887
     
    890891    function inject_js($content, $js_locations, $js_locations_footer) {
    891892        if (count($js_locations) > 0) {
     893            $wpm_options = get_option($this->name);
    892894            // build minify URLS
    893895            $js_tags = '';
    894896            $minify_urls = $this->build_minify_urls($js_locations, '.js');
    895897            if ($js_locations_footer) {
     898                $js_tags_footer = '';
    896899                $minify_urls_footer = $this->build_minify_urls($js_locations_footer, '.js');
    897900            }
     
    925928                foreach ($minify_urls_footer as $minify_url) {
    926929                    $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
    927                     $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
     930                    $js_tags_footer .= "<script type='text/javascript' src='$minify_url'></script>";
    928931                }
    929932   
     
    931934   
    932935                if ($matches) {
    933                     $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags", $content, 1); // limit 1 replacement
     936                    $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags_footer", $content, 1); // limit 1 replacement
    934937                } else {
    935                     $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
     938                    $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags_footer", $content, 1); // limit 1 replacement
    936939                    $placeholderRemoved = true;
    937940                }
    938941            }
    939942           
    940             // If necessary, remove placeholder comment
     943            // If necessary (custom footer position comment), remove placeholder comment
    941944            if ($placeholderRemoved === false) {
    942                 $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
     945                $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "", $content, 1); // limit 1 replacement
    943946            }
    944947        }
  • wp-minify-fix/trunk/min/lib/Minify/HTML.php

    r891097 r1271293  
    146146       
    147147        // use newlines before 1st attribute in open tags (to limit line lengths)
    148         $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
     148        //$this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
     149       
     150        // remove newlines
     151        $this->_html = str_replace("\n", ' ', $this->_html);
    149152       
    150153        // fill placeholders
  • wp-minify-fix/trunk/options-generic.php

    r1081305 r1271293  
    115115        printf('
    116116            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    117             <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
    118             <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
    119             <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
     117            <p><label>%s<br/><textarea name="wpm_options_update[js_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['js_exclude'])).'</textarea></label></p>
     118            <p><label>%s<br/><textarea name="wpm_options_update[css_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['css_exclude'])).'</textarea></label></p>
     119            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><textarea name="wpm_options_update[uri_exclude]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['uri_exclude'])).'</textarea></label></p>
    120120            ',
    121121            __('Local Files Minification', $this->name),
     
    128128            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    129129            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[cache_external]" id="cache_external_checkbox" state="'.$include_toggle_state.'" type="checkbox" '.checked(true, $wpm_options['cache_external'], false).'/> &nbsp; (%s)</label></p>
    130             <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
    131             <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.attribute_escape(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
     130            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[js_include]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['js_include'])).'</textarea></label></p>
     131            <p class="wpm_advanced wpm_include" '.$advanced_style.' '.$include_style.'><label>%s (%s, <a href="http://omninoggin.com/wordpress-posts/tutorial-wp-minify-options/#include_external_files">%s</a>)<br/><textarea name="wpm_options_update[css_include]" style="width:600px" rows="5">'.esc_attr(implode(chr(10), $wpm_options['css_include'])).'</textarea></label></p>
    132132            ',
    133133            __('Non-Local Files Minification', $this->name),
     
    144144        printf('
    145145            <h2 class="wpm_advanced" '.$advanced_style.'>%s</h2>
    146             <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.attribute_escape($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
     146            <p class="wpm_advanced" '.$advanced_style.'><label>%s<input name="wpm_options_update[cache_interval]" type="text" size="4" value="'.esc_attr($wpm_options['cache_interval']).'"/>%s <span class="submit"><input type="submit" name="wpm_options_clear_cache_submit" value="%s"/></span></p></label>
    147147            ',
    148148            __('Caching', $this->name),
     
    188188        printf('
    189189            <p class="wpm_advanced" '.$advanced_style.'><label>%s &nbsp; <input name="wpm_options_update[auto_base]" type="checkbox" '.checked(true, $wpm_options['auto_base'], false).'/></label></p>
    190             <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.attribute_escape($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
     190            <p class="wpm_advanced" '.$advanced_style.'><label>%s<br/><input name="wpm_options_update[extra_minify_options]" type="text" size="100" value="'.esc_attr($wpm_options['extra_minify_options']).'"/><br/><em>%s</em></label></p>
    191191            ',
    192192            __('Automatically set your Minify base per siteurl setting (recommended)', $this->name),
  • wp-minify-fix/trunk/readme.txt

    r1081305 r1271293  
    11=== WP Minify Fix ===
    2 Tags: minify, js, css, html, javascript, cascading style sheets, optimize, performance, speed, http request, phpspeedy, fix, compress, performance, import
     2Tags: minify, js, css, html, javascript, cascading style sheets, optimize, performance, performance optimization, optimize, optimizer, speed, http request, phpspeedy, fix, compress, performance, import, cache, combine, bundle, plugin, google page speed, nginx
    33Contributors: NodeCode, madeinthayaland
    4 Requires at least: 2.7
    5 Tested up to: 4.1
    6 Stable Tag: 1.4.0
     4Requires at least: 2.8
     5Tested up to: 4.3.1
     6Stable Tag: 1.4.1
    77
    88[Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files
     
    1212This plugin is a fork of [WP Minify](http://wordpress.org/plugins/wp-minify/) to fix bugs and add features, because it has not been updated since 2012-6-4.
    1313
    14 This plugin integrates the [Minify engine](http://code.google.com/p/minify/)
     14This plugin integrates the [Minify engine](https://github.com/mrclay/minify)
    1515into your WordPress blog.  Once enabled, this plugin will combine and compress
    1616JS and CSS files to improve page load time.
     
    4848* Plugin hooks!
    4949
     50You can also commit changes on our [Github repository](https://github.com/nodecode/wp-minify-fix).
     51
    5052== Changelog ==
     53= 1.4.1 =
     54* Duplicate footer scripts bug fixed
     55* PHP warning message in some scenarios fixed
     56* Newlines before the first attribute in open tags removed
     57* Compatibility changes
     58
    5159= 1.4.0 =
    5260* Added option for the HTML5 async attribute
  • wp-minify-fix/trunk/wp-minify.php

    r1081305 r1271293  
    44Plugin URI: http://wordpress.org/plugins/wp-minify-fixed/
    55Description: [Fixed] This plugin uses the Minify engine to combine and compress JS and CSS files to improve page load time.
    6 Version: 1.4.0
     6Version: 1.4.1
    77Author: NodeCode
    88Author URI: http://nodecode.de
     
    1010
    1111/*
    12 Copyright 2013 NodeCode (email: [email protected])
     12Copyright 2013-2015 NodeCode (email: [email protected])
    1313Copyright 2009-2011 Thaya Kareeson (email: [email protected])
    1414
     
    3535    var $name_proper = 'WP Minify Fix';
    3636    var $required_wp_version = '2.7';
    37     var $version = '1.4.0';
     37    var $version = '1.4.1';
    3838
    3939    var $c = null;
     
    474474            // append &debug if we need to
    475475            if ($wpm_options['debug_nominify']) {
    476                 $debug_string = '&amp;debug=true';
     476                $debug_string = '&debug=true';
    477477            } else {
    478478                $debug_string = '';
     
    482482            $base = $this->get_base();
    483483            if ($base != '') {
    484                 $base_string = '&amp;b='.$base;
     484                $base_string = '&b='.$base;
    485485            } else {
    486486                $base_string = '';
     
    490490            $extra_minify_options = preg_replace('/(&|&amp;|\b)b=[^&]*/', '', trim($wpm_options['extra_minify_options']));
    491491            if (trim($extra_minify_options) != '') {
    492                 $extra_string = '&amp;'.$extra_minify_options;
     492                $extra_string = '&'.$extra_minify_options;
    493493            } else {
    494494                $extra_string = '';
     
    496496
    497497            // append last modified time
    498             $latest_modified_string = '&amp;m='.$latest_modified;
     498            $latest_modified_string = '&m='.$latest_modified;
    499499
    500500            return array($base_url . '?f=' . implode(',', $files) . $debug_string . $base_string . $extra_string . $latest_modified_string);
     
    882882            }
    883883   
    884             $js_locations_footer = array_unique($js_locations_footer);
     884            if ($js_locations_footer != NULL)
     885                $js_locations_footer = array_unique($js_locations_footer);
    885886        }
    886887
     
    890891    function inject_js($content, $js_locations, $js_locations_footer) {
    891892        if (count($js_locations) > 0) {
     893            $wpm_options = get_option($this->name);
    892894            // build minify URLS
    893895            $js_tags = '';
    894896            $minify_urls = $this->build_minify_urls($js_locations, '.js');
    895897            if ($js_locations_footer) {
     898                $js_tags_footer = '';
    896899                $minify_urls_footer = $this->build_minify_urls($js_locations_footer, '.js');
    897900            }
     
    925928                foreach ($minify_urls_footer as $minify_url) {
    926929                    $minify_url = apply_filters('wp_minify_js_url', $minify_url); // Allow plugins to modify final minify URL
    927                     $js_tags .= "<script type='text/javascript' src='$minify_url'></script>";
     930                    $js_tags_footer .= "<script type='text/javascript' src='$minify_url'></script>";
    928931                }
    929932   
     
    931934   
    932935                if ($matches) {
    933                     $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags", $content, 1); // limit 1 replacement
     936                    $content = preg_replace('/<!-- WP-Minify JS Footer -->/', "$js_tags_footer", $content, 1); // limit 1 replacement
    934937                } else {
    935                     $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
     938                    $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags_footer", $content, 1); // limit 1 replacement
    936939                    $placeholderRemoved = true;
    937940                }
    938941            }
    939942           
    940             // If necessary, remove placeholder comment
     943            // If necessary (custom footer position comment), remove placeholder comment
    941944            if ($placeholderRemoved === false) {
    942                 $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "$js_tags", $content, 1); // limit 1 replacement
     945                $content = preg_replace('/<!-- WP-Minify Footer Placeholder -->/', "", $content, 1); // limit 1 replacement
    943946            }
    944947        }
Note: See TracChangeset for help on using the changeset viewer.