From 47b71fada22f04db84bb00bfc2742854c7a3a828 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sun, 4 Mar 2012 21:14:28 -0500
Subject: [PATCH] 2.1.5 preparation

---
 HISTORY.txt           |  9 +++++++++
 min/builder/_index.js | 17 +++++++++++++----
 min/config.php        |  5 ++---
 min/lib/Minify.php    |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/HISTORY.txt b/HISTORY.txt
index 94606ed..0089607 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,5 +1,14 @@
 Minify Release History
 
+Version 2.1.5
+    * Removed XSS vulnerability
+    * Disabled builder bby default
+    * command line tools to minify and rewrite URIs in CSS
+    * upgrade (optional) JSMin+ library
+    * more efficient JS minification when using CC/YUIC
+    * Closure Compiler uses cURL when allow_url_fopen is off
+    * Missing file notices when using groups
+
 Version 2.1.4
     * Option to minify JS with Closure Compiler API w/ JSMin failover
     * Cookie/bookmarklet-based debug mode. No HTML editing!
diff --git a/min/builder/_index.js b/min/builder/_index.js
index 8d0a3e2..ee81e22 100644
--- a/min/builder/_index.js
+++ b/min/builder/_index.js
@@ -214,10 +214,19 @@ var MUB = {
         if (location.hash) {
             // make links out of URIs from bookmarklet
             $('#getBm').hide();
-            $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>' +
-                 location.hash.substr(1).split(',').join('</a> | /<a href=#>') +
-                 '</a></p>'
-            );
+            var i = 0, found = location.hash.substr(1).split(','), l = found.length;
+            $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /</p>');
+            var $p = $('#bmUris p');
+            for (; i < l; i++) {
+                $p.append($('<a href=#></a>').text(found[i])[0]);
+                if (i < (l - 1)) {
+                    $p.append(', /');
+                }
+            }
+//            $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>' +
+//                 location.hash.substr(1).split(',').join('</a> | /<a href=#>') +
+//                 '</a></p>'
+//            );
             $('#bmUris a').click(function () {
                 MUB.addButtonClick();
                 $('#sources li:last input').val(this.innerHTML);
diff --git a/min/config.php b/min/config.php
index 8a3a890..46397e7 100644
--- a/min/config.php
+++ b/min/config.php
@@ -34,10 +34,9 @@ $min_allowDebugFlag = false;
 
 
 /**
- * Allow use of the Minify URI Builder app. If you no longer need 
- * this, set to false.
+ * Allow use of the Minify URI Builder app. Only set this to true while you need it.
  **/
-$min_enableBuilder = true;
+$min_enableBuilder = false;
 
 
 /**
diff --git a/min/lib/Minify.php b/min/lib/Minify.php
index 36b1d48..f04b8f1 100644
--- a/min/lib/Minify.php
+++ b/min/lib/Minify.php
@@ -29,7 +29,7 @@ require_once 'Minify/Source.php';
  */
 class Minify {
     
-    const VERSION = '2.1.4';
+    const VERSION = '2.1.5';
     const TYPE_CSS = 'text/css';
     const TYPE_HTML = 'text/html';
     // there is some debate over the ideal JS Content-Type, but this is the