mirror of
https://github.com/matthiasmullie/minify.git
synced 2025-02-22 12:13:01 +01:00
I had accidentally undone some valid changes; restoring now
This commit is contained in:
parent
9e3d713060
commit
7f17bcfc22
8
CSS.php
8
CSS.php
@ -22,7 +22,7 @@ namespace MatthiasMullie\Minify;
|
|||||||
*
|
*
|
||||||
* @author Matthias Mullie <minify@mullie.eu>
|
* @author Matthias Mullie <minify@mullie.eu>
|
||||||
* @author Tijs Verkoyen <minify@verkoyen.eu>
|
* @author Tijs Verkoyen <minify@verkoyen.eu>
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
*
|
*
|
||||||
* @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved.
|
* @copyright Copyright (c) 2012, Matthias Mullie. All rights reserved.
|
||||||
* @license MIT License
|
* @license MIT License
|
||||||
@ -55,9 +55,6 @@ class CSS extends Minify
|
|||||||
*/
|
*/
|
||||||
protected function combineImports($source, $content)
|
protected function combineImports($source, $content)
|
||||||
{
|
{
|
||||||
// validate data
|
|
||||||
if($content == $source) throw new Exception('The data for "' . $source . '" could not be loaded, please make sure the path is correct.');
|
|
||||||
|
|
||||||
// the regex to match import statements
|
// the regex to match import statements
|
||||||
$importRegex = '/
|
$importRegex = '/
|
||||||
|
|
||||||
@ -364,9 +361,6 @@ class CSS extends Minify
|
|||||||
*/
|
*/
|
||||||
protected function move($source, $destination, $content)
|
protected function move($source, $destination, $content)
|
||||||
{
|
{
|
||||||
// validate data
|
|
||||||
if($content == $source) throw new Exception('The data for "' . $source . '" could not be loaded, please make sure the path is correct.');
|
|
||||||
|
|
||||||
// regex to match paths
|
// regex to match paths
|
||||||
$pathsRegex = '/
|
$pathsRegex = '/
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user