Merge remote-tracking branch 'origin/master' into develop

robocoder · robocoder · commit 4c1e71aabd30 · 2015-01-27T14:16:29.000-05:00
diff --git a/src/Server.php b/src/Server.php
@@ -275,13 +275,14 @@ public function serve($salt = '')
 
                     echo $css;
 
-                    return;
                 } catch (\Exception $e) {
                     header($protocol . ' 500 Internal Server Error');
                     header('Content-type: text/plain');
 
                     echo 'Parse error: ' . $e->getMessage() . "\n";
                 }
+
+                return;
             }
 
             header('X-SCSS-Cache: true');

Original file line number	Diff line number	Diff line change
`@@ -275,13 +275,14 @@ public function serve($salt = '')`
`275`	`275`
`276`	`276`	`echo $css;`
`277`	`277`
`278`		`- return;`
`279`	`278`	`} catch (\Exception $e) {`
`280`	`279`	`header($protocol . ' 500 Internal Server Error');`
`281`	`280`	`header('Content-type: text/plain');`
`282`	`281`
`283`	`282`	`echo 'Parse error: ' . $e->getMessage() . "\n";`
`284`	`283`	`}`
	`284`	`+`
	`285`	`+ return;`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`header('X-SCSS-Cache: true');`