Merge branch 'MDL-51530-master' of git://github.com/ryanwyllie/moodle

lib/lessphp/Cache.php

@@ -91,7 +91,7 @@ public static function Get( $less_files, $parser_options = array(), $modify_vars
 				self::ListFiles($list_file, $list, $cached_name);
 				$compiled_name = self::CompiledName($list);
 
-				// if $cached_name != $compiled_name, we know we need to recompile
+				// if $cached_name is the same as the $compiled name, don't regenerate
 				if( !$cached_name || $cached_name === $compiled_name ){
 
 					$output_file = self::OutputFile($compiled_name, $parser_options );
@@ -252,7 +252,7 @@ public static function CleanCache(){
 					continue;
 				}
 
-				$full_path = Less_Cache::$cache_dir.'/'.$file;
+				$full_path = Less_Cache::$cache_dir . $file;
 
 				// make sure the file still exists
 				// css files may have already been deleted
@@ -280,7 +280,7 @@ public static function CleanCache(){
 				if( $type === 'list' ){
 					self::ListFiles($full_path, $list, $css_file_name);
 					if( $css_file_name ){
-						$css_file = Less_Cache::$cache_dir.'/'.$css_file_name;
+						$css_file = Less_Cache::$cache_dir . $css_file_name;
 						if( file_exists($css_file) ){
 							unlink($css_file);
 						}
@@ -313,4 +313,4 @@ static function ListFiles($list_file, &$list, &$css_file_name ){
 
 	}
 
-}
+}

lib/lessphp/Exception/Parser.php

@@ -54,7 +54,7 @@ public function __construct($message = null, Exception $previous = null, $index
 
 	protected function getInput(){
 
-		if( !$this->input && $this->currentFile && $this->currentFile['filename'] ){
+		if( !$this->input && $this->currentFile && $this->currentFile['filename'] && file_exists($this->currentFile['filename']) ){
 			$this->input = file_get_contents( $this->currentFile['filename'] );
 		}
 	}