Changeset 950578

Timestamp:

07/17/2014 07:42:12 PM (12 years ago)

Author:

timmcdaniels

Message:

version 2.1

Location:

combine-js

Files:

• tags/2.1 (added)
• tags/2.1/classes (added)
• tags/2.1/classes/combine-js-class.php (added)
• tags/2.1/classes/jsmin.php (added)
• tags/2.1/combine-js.php (added)
• tags/2.1/js.php (added)
• tags/2.1/lang (added)
• tags/2.1/readme.txt (added)
• tags/2.1/screenshot-1.png (added)
• tags/2.1/views (added)
• tags/2.1/views/admin_settings_form.php (added)
• trunk/classes/combine-js-class.php (modified) (2 diffs)
• trunk/combine-js.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

combine-js/trunk/classes/combine-js-class.php

@@ -8 +8 @@
     const nspace = 'combine-js';
     const pname = 'Combine JS';
-    const version = 2.0;
+    const version = 2.1;
 
     protected $_plugin_file;
@@ -519 +519 @@
             $this->debug( 'Write: ' . $file );
             $fp = fopen( $file, "w" );
-            if ( flock( $fp, LOCK_EX ) ) { // do an exclusive lock
+            if ( flock( $fp, LOCK_EX, $wouldblock ) ) { // do an exclusive lock
                 fwrite( $fp, $content );
-                flock( $fp, LOCK_UN ); // release the lock
+                flock( $fp, LOCK_UN, $wouldblock ); // release the lock
             }
             fclose( $fp );

combine-js/trunk/combine-js.php

@@ -5 +5 @@
 Description: WordPress plugin that attempts to combine, minify, and compress JS.
 Author: Convoy
-Version: 2.0
+Version: 2.1
 Author URI: http://www.weareconvoy.com
 Requires at least: 3.0.0

combine-js/trunk/readme.txt

@@ -3 +3 @@
 Tags: javascript,combine,minify,gzip,compress
 Tested up to: 3.9.1
-Stable tag: 2.0
+Stable tag: 2.1
 Requires at least: 3.0.1
 
@@ -36 +36 @@
 
 == Changelog ==
+
+= 2.1 =
+* fix flock warning spotted by Manuel Razzari on wpengine.
 
 = 2.0 =