Skip to content

Commit

Permalink
Evolution CMS 1.4.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmi3yy committed Mar 13, 2020
1 parent 6f67301 commit a61459a
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 2 deletions.
31 changes: 31 additions & 0 deletions assets/docs/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,37 @@
This file shows the changes in recent releases of Evolution CMS. The most current release is usually the
development release, and is only shown to give an idea of what's currently in the pipeline.


Evolution CMS 1.4.11 (Mar 13, 2020)

* [GitHub:#6f67301ba] - Update DocLister to 2.5.2 (Dmi3yy)
* [GitHub:#8d5b31b1f] - Update FormLister to 1.10.3 (Dmi3yy)
* [GitHub:#6e491904a] - keep plugins priority (mnoskov)
* [GitHub:#0859d1062] - getting installed plugin fix (mnoskov)
* [GitHub:#376d7f57c] - getting previous events fix (mnoskov)
* [GitHub:#449e8160e] - Update instprocessor.php (mnoskov)
* [GitHub:#1883666e4] - update bk manager (dzhuryn)
* [GitHub:#acc871ecb] - nested snippet 100->200 (Dmytro Lukianenko)
* [GitHub:#6f7ad2534] - Update russian.php (projkin)
* [GitHub:#e4c47375d] - remove event name duplicates (Pathologic)
* [GitHub:#425b623f8] - fix for nested snippet work with PHx (Dmi3yy)
* [GitHub:#21ae71665] - fix(forms.css): fixed height input (Serg)
* [GitHub:#7c44e274c] - fix(forms.css) changed height inputs (Serg)
* [GitHub:#f3be07dd7] - Fix missing panel toggle arrows (Mr B)
* [GitHub:#29f80ce9a] - Fix tree icon for private resource (Mr B)
* [GitHub:#6c5f69caa] - fix(modx.js): remove loader with locked resource (Serg)
* [GitHub:#787bf71c4] - fix #1261 mcpuk browser missing icons (Nicola)
* [GitHub:#53ec9444f] - Fix right arrow icon before element description (Sasha Beep)
* [GitHub:#d1a4f2e83] - fix demo site install (Pathologic)
* [GitHub:#22713e57e] - fix(modx.js): remove jQuery variable (Serg)
* [GitHub:#f5079d97f] - feat(modx.js): remove jQuery methods (Serg)
* [GitHub:#0fbd46f2a] - feat(modx.js): remove jQuery animate (Serg)
* [GitHub:#3a864cbc9] - fix #1246 (kivamp)
* [GitHub:#e08a7f971] - Fix fullscreen tinymce hiding buttons (Mr B)
* [GitHub:#8bcf79aa7] - fix icon in tree when move #1167 (Dmi3yy)
* [GitHub:#8bcf79237] - fix allert with error internet connection in Chrome (Dmi3yy)


Evolution CMS 1.4.10 (Nov 5, 2019)
* [GitHub:#9cdb6bca9] - Update FA5 in Elements Tree (Dmi3yy)
* [GitHub:#ce883d04a] - fix ignore failed_login_attempts setting (Pathologic)
Expand Down
41 changes: 41 additions & 0 deletions assets/snippets/DocLister/core/extender/commentscount.extender.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/**
* Jot extender for DocLister
*
* @category extender
* @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
* @author Pathologic <[email protected]>
*/
class commentscount_DL_Extender extends extDocLister
{
/**
* @return bool
*/
protected function run()
{
$context = $this->DocLister->getCFGDef('context', 'site_content');
$context = $this->modx->db->escape($context);
$countDeleted = $this->DocLister->getCFGDef('countDeletedComments', 0);
$countUnpublished = $this->DocLister->getCFGDef('countUnpublishedComments', 0);
if (!$countDeleted && !$countUnpublished) {
$join = "LEFT JOIN {$this->DocLister->getTable('comments_stat')} `s` ON `s`.`context`='{$context}' AND `s`.`thread` = {$this->DocLister->getPK()}";
} else {
$where = array();
if (!$countDeleted) {
$where[] = '`deleted`=0';
}
if (!$countUnpublished) {
$where[] = '`published`=1';
}
$where = implode(' AND ', $where);
$join = "LEFT JOIN (SELECT `thread`, COUNT(`id`) AS `comments_count` FROM {$this->DocLister->getTable('comments')} WHERE `context`='{$context}' {$where} GROUP BY `thread`) `s` ON `s`.`thread` = {$this->DocLister->getPK()}";
}
$this->DocLister->setFiltersJoin($join);
$fields = $this->DocLister->getCFGDef('selectFields', 'c.*');
$this->DocLister->config->setConfig(array(
"selectFields" => $fields . ",IFNULL(`s`.`comments_count`,0) AS `comments_count`"
));

return true;
}
}
4 changes: 2 additions & 2 deletions manager/includes/version.inc.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$modx_version = '1.4.10'; // Current version number
$modx_release_date = 'Nov 05, 2019'; // Date of release
$modx_version = '1.4.11'; // Current version number
$modx_release_date = 'Mar 13, 2020'; // Date of release
$modx_branch = 'Evolution'; // Codebase name
$modx_full_appname = "{$modx_branch} {$modx_version} ({$modx_release_date})";

0 comments on commit a61459a

Please sign in to comment.