Merge branch 'hotfix' into dev

pressbooks · Aug 22, 2018 · bd44309 · bd44309
2 parents b533d46 + 7bad7a1
commit bd44309
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,13 @@
 == Changelog ==
+= 5.4.7 =
+
+* Pressbooks 5.4.7 requires [WordPress 4.9.7](https://wordpress.org/news/2018/07/wordpress-4-9-7-security-and-maintenance-release/).
+* Pressbooks 5.4.7 requires [McLuhan >= 2.4.0](https://github.com/pressbooks/pressbooks-book/).
+
+**Patches**
+
+* Fix 500 error introduced in [#1318](https://github.com/pressbooks/pressbooks/pull/1318): [#1326](https://github.com/pressbooks/pressbooks/pull/1326)
+
 = 5.4.6 =
 
 * Pressbooks 5.4.6 requires [WordPress 4.9.7](https://wordpress.org/news/2018/07/wordpress-4-9-7-security-and-maintenance-release/).

diff --git a/inc/class-sass.php b/inc/class-sass.php
@@ -165,7 +165,7 @@ public function compile( $scss, $includes = [] ) {
 			}
 		} catch ( \Exception $e ) {
 
-			$error_message = print_r( $sass->getParsedFiles(), true ); // @codingStandardsIgnoreLine
+			$error_message = print_r( $scssphp->getParsedFiles(), true ); // @codingStandardsIgnoreLine
 			$_SESSION['pb_errors'][] = sprintf(
 				__( 'There was a problem with SASS. Contact your site administrator. Error: %1$s %2$s', 'pressbooks' ),
 				$e->getMessage(),