1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00

#Issue #4473 - some merged code.

This commit is contained in:
Cameron
2021-03-31 12:35:26 -07:00
parent 90ba858059
commit 8ff427cfc4
3 changed files with 7 additions and 11 deletions

View File

@@ -1648,6 +1648,7 @@ class comment
public function loadNested($id, $type, $sort)
{
$tp = e107::getParser();
$this->nestedComments = array();
$query = "SELECT c.*, u.*, ue.*, r.* FROM #comments AS c
LEFT JOIN #user AS u ON c.comment_author_id = u.user_id

View File

@@ -9,20 +9,14 @@
protected function _before()
{
if(e107::getDb()->isEmpty('comments'))
{
e107::getDb()->truncate('comments');
$path = codecept_data_dir().'comments/commentsSetup.xml';
$result = e107::getXml()->e107Import($path);
if(!empty($result['failed']))
{
$this->fail("Vstore setup failed. ".print_r($result['failed'], true));
$this->fail("Comment setup failed. ".print_r($result['failed'], true));
}
}
try
{
$this->cm = e107::getComment();

View File

@@ -1076,6 +1076,7 @@ class e107Test extends \Codeception\Test\Unit
$e107 = $this->e107;
$templates = scandir(e_CORE . "templates");
$e107::loadAdminIcons();
$exclude = array(
'bbcode_template.php',