Fix error in article model (#36617)

richard67 · web-flow · commit ca0c42d0ae2b · 2022-01-09T17:07:49.000Z
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -417,7 +417,7 @@ public function getItem($pk = null)
 			$registry = new Registry($item->urls);
 			$item->urls = $registry->toArray();
 
-			$item->articletext = ($item->fulltext === null || trim($item->fulltext) != '') ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;
+			$item->articletext = ($item->fulltext !== null && trim($item->fulltext) != '') ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;
 
 			if (!empty($item->id))
 			{

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ public function getItem($pk = null)`
`417`	`417`	`$registry = new Registry($item->urls);`
`418`	`418`	`$item->urls = $registry->toArray();`
`419`	`419`
`420`		`- $item->articletext = ($item->fulltext === null \|\| trim($item->fulltext) != '') ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;`
	`420`	`+ $item->articletext = ($item->fulltext !== null && trim($item->fulltext) != '') ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;`
`421`	`421`
`422`	`422`	`if (!empty($item->id))`
`423`	`423`	`{`