Skip to content

Commit

Permalink
Merge branch 'release/1.7.37.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhukster committed Oct 5, 2022
2 parents ea9c9fd + 7e5ff71 commit 00b13d1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.7.37.1
## 10/05/2022

1. [](#bugfix)
* Fixed a bad return type [#3630](https://github.com/getgrav/grav/issues/3630)

# v1.7.37
## 10/05/2022

Expand Down
2 changes: 1 addition & 1 deletion system/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.7.37');
define('GRAV_VERSION', '1.7.37.1');
define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
define('GRAV_TESTING', false);

Expand Down
8 changes: 4 additions & 4 deletions system/src/Grav/Common/Page/Pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -2226,19 +2226,19 @@ protected function getVersion(): string
* this is particularly useful to know if pages have changed and you want
* to sync another cache with pages cache - works best in `onPagesInitialized()`
*
* @return string
* @return null|string
*/
public function getPagesCacheId(): string
public function getPagesCacheId(): ?string
{
return $this->pages_cache_id;
}

/**
* Get the simple pages hash that is not md5 encoded, and isn't specific to language
*
* @return string
* @return null|string
*/
public function getSimplePagesHash(): string
public function getSimplePagesHash(): ?string
{
return $this->simple_pages_hash;
}
Expand Down

2 comments on commit 00b13d1

@kontonfon
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi developer, I submitted an SSTI bug leading to RCE in platform bug bounty dev hunter version 1.7.37.1, but it's been more than 10 months now, I still haven't received any response on my report, and when I logged in back on github, I see there are newer versions. So please review and respond to the report to help me
This is my report on dev hunter: https://huntr.dev/bounties/34b25f11-0a2c-47b2-bd50-5d135836e269/

@rhukster
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please submit any security vulnerabilities via Github: https://github.com/getgrav/grav/security - we don't use 3rd party services. Cheers.

Please sign in to comment.