From 7fc33eb01cf8dba92b6c626d2668b0bbd1a9c76e Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 13 Feb 2013 15:16:17 +0100
Subject: [PATCH] [-] Catch JSMin exception and return uncompressed js
 #PSCFV-7686 #PSCFV-5785

---
 classes/Media.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/Media.php b/classes/Media.php
index 7e2802c00..a9e46a0d3 100755
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -128,12 +128,18 @@ class MediaCore
 
 	public static function packJS($js_content)
 	{
-		if (strlen($js_content) > 0)
+		if (!empty($js_content))
 		{
 			require_once(_PS_TOOL_DIR_.'js_minify/jsmin.php');
-			return JSMin::minify($js_content);
+			try {
+				$js_content = JSMin::minify($js_content);
+			} catch (Exception $e) {
+				if (_PS_MODE_DEV_)
+					echo $e->getMessage();
+				return $js_content;
+			}
 		}
-		return false;
+		return $js_content;
 	}
 
 	public static function minifyCSS($css_content, $fileuri = false, &$import_url = array())