doc: changelog

.hgtags

@@ -1,3 +1,4 @@
 769fad81e3f8db8f7e5f5c164656a382a169d735 release-1.0.0
 9ed95938d809a8226aca529e34b655e6d8c8c379 release-1.0.1
 46fe533682419c8a519836ac95b5575053aa0fa8 release-1.0.2
+a2c92b262f339f82eb01c8d92dda252a27432255 release-1.1.0

_dist/README.txt

@@ -12,6 +12,9 @@ Tags: nmdc
 
 =CHANGELOG=
 
+2017-02-06 1.1.1
+- Fix an issue with malformed content in minified build
+
 2017-02-06 1.1.0
 - Feature: Remember last username/password for login; remember last "show joins/parts" status
 - Feature: Display user details on hover (description, email, client tag, share size)

clientpack.php

@@ -30,21 +30,18 @@ if (is_dir('clientpack')) {
 
 // Embed css into HTML file
 
-$css_file = file_get_contents('clientpack/dcwebui.min.css');
-
 $html_content = file_get_contents('clientpack/index.htm');
-$html_content = preg_replace('~<link[^>]+dcwebui.css[^>]*>~', '<style type="text/css">'.$css_file.'</style>', $html_content);
+
+$html_content = preg_replace_callback('~<link[^>]+dcwebui.css[^>]*>~', function() { return '<style type="text/css">'.file_get_contents('clientpack/dcwebui.min.css').'</style>'; }, $html_content);
 
 // Embed JS into HTML file
 
-$js_file = file_get_contents('clientpack/dcwebui.min.js');
-$html_content = preg_replace('~<script[^>]+dcwebui.js[^>]*>~', '<script type="text/javascript">'.$js_file.'</script>', $html_content);
+$html_content = preg_replace_callback('~<script[^>]+dcwebui.js[^>]*>~', function() { return '<script type="text/javascript">'.file_get_contents('clientpack/dcwebui.min.js').'</script>'; }, $html_content);
 
 // Embed socketio into HTML file
 
-$SIO_NAME = 'socket.io-1.7.2.js';
-$sio_file = file_get_contents('clientpack/'.$SIO_NAME);
-$html_content = preg_replace('~<script[^>]+'.$SIO_NAME.'[^>]*>~', '<script type="text/javascript">'.$sio_file.'</script>', $html_content);
+define('SIO_NAME', 'socket.io-1.7.2.js');
+$html_content = preg_replace_callback('~<script[^>]+'.SIO_NAME.'[^>]*>~', function() { return '<script type="text/javascript">'.file_get_contents('clientpack/'.SIO_NAME).'</script>'; }, $html_content);
 
 // Minify the combined file
 
@@ -55,5 +52,5 @@ file_put_contents('clientpack/index.htm', $html_content);
 // Clean up files
 
 `rm clientpack/{index.htm,dcwebui{.min,}.js,dcwebui{.min,}.css}`;
-unlink('clientpack/'.$SIO_NAME);
+unlink('clientpack/'.SIO_NAME);
 rename('clientpack/index.min.htm', 'clientpack/index.htm');