BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)

Fixes #5987
silverstripe · Dec 21, 2016 · f314b86 · f314b86
1 parent c794c29
commit f314b86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/parsers/ShortcodeParser.php b/parsers/ShortcodeParser.php
@@ -584,7 +584,8 @@ public function parse($content) {
 
 			$location = self::INLINE;
 			if($class == 'left' || $class == 'right') $location = self::BEFORE;
-			if($class == 'center' || $class == 'leftAlone') $location = self::SPLIT;
+			// Note: center / leftAlone should be `self::SPLIT`, but this crashes so we fall back to self::INLINE
+			// if($class == 'center' || $class == 'leftAlone') $location = self::SPLIT;
 
 			if(!$parent) {
 				if($location !== self::INLINE) {

diff --git a/tests/parsers/ShortcodeParserTest.php b/tests/parsers/ShortcodeParserTest.php
@@ -185,7 +185,8 @@ protected function assertEqualsIgnoringWhitespace($a, $b, $message = null) {
 		$this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
 	}
 
-	public function testtExtract() {
+	public function testtExtractBefore()
+	{
 		// Left extracts to before the current block
 		$this->assertEqualsIgnoringWhitespace(
 			'Code<div>FooBar</div>',
@@ -197,6 +198,13 @@ public function testtExtract() {
 			'Code<div>Foo<b>BarBaz</b>Qux</div>',
 			$this->parser->parse('<div>Foo<b>Bar[test_shortcode class=left]Code[/test_shortcode]Baz</b>Qux</div>')
 		);
+	}
+
+	public function testExtractSplit()
+	{
+		$this->markTestSkipped(
+			'Feature disabled due to https://github.com/silverstripe/silverstripe-framework/issues/5987'
+		);
 
 		// Center splits the current block
 		$this->assertEqualsIgnoringWhitespace(
@@ -209,7 +217,9 @@ public function testtExtract() {
 			'<div>Foo<b>Bar</b></div>Code<div><b>Baz</b>Qux</div>',
 			$this->parser->parse('<div>Foo<b>Bar[test_shortcode class=center]Code[/test_shortcode]Baz</b>Qux</div>')
 		);
+	}
 
+	public function testExtractNone() {
 		// No class means don't extract
 		$this->assertEqualsIgnoringWhitespace(
 			'<div>FooCodeBar</div>',