Skip to content

Commit

Permalink
Develop (#253)
Browse files Browse the repository at this point in the history
- Adding fix for removing slashes at the end of URL and only adding them before subpages
- Fixing WonderCMS news link

* Update version
  • Loading branch information
robiso authored Feb 3, 2022
1 parent 6d5fda4 commit 506b038
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

session_start();
define('VERSION', '3.3.0');
define('VERSION', '3.3.1');
mb_internal_encoding('UTF-8');

if (defined('PHPUNIT_TESTING') === false) {
Expand Down Expand Up @@ -1795,7 +1795,7 @@ private function checkWcmsCoreUpdate(): void
$this->alert(
'info',
'<h3>New WonderCMS update available</h3>
<a href="https://wondercms.com/whatsnew" target="_blank"><u><b>Check what\'s new</b></u></a>
<a href="https://wondercms.com/news" target="_blank"><u><b>Check what\'s new</b></u></a>
and <b>backup your website</b> before updating.
<form action="' . $this->getCurrentPageUrl() . '" method="post" class="marginTop5">
<button type="submit" class="wbtn wbtn-info marginTop20" name="backup"><i class="installIcon"></i>Download backup</button>
Expand Down Expand Up @@ -2366,7 +2366,7 @@ private function renderPageNavMenuItem(object $item, string $parentSlug = ''): s
$visibleSubpage = $subpages && in_array('show', array_column((array)$subpages, 'visibility'));
}

$parentSlug .= $item->slug . '/';
$parentSlug .= $subpages ? $item->slug . '/' : $item->slug;
$output = '<li class="nav-item ' . ($this->currentPage === $item->slug ? 'active ' : '') . ($visibleSubpage ? 'subpage-nav' : '') . '">
<a class="nav-link" href="' . self::url($parentSlug) . '">' . $item->name . '</a>';

Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.0
3.3.1

0 comments on commit 506b038

Please sign in to comment.