Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-05 20:11:50 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'release/0.9.39'

Browse Source
This commit is contained in:
Andy Miller
2015-08-25 10:45:28 -06:00
parent 795268a98b 7e3226e596
commit cb074afd85
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,3 +1,10 @@
# v0.9.39
## 08/25/2015
1. [](#bugfix)
* `Page.active()` not triggering on **homepage**
* Fix for invalid session name in Opera browser
# v0.9.38
## 08/24/2015

2
system/defines.php
View File

@@ -2,7 +2,7 @@
// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '0.9.38');
define('GRAV_VERSION', '0.9.39');
define('DS', '/');
// Directories and Paths

2
system/src/Grav/Common/Page/Page.php
View File

@@ -1710,7 +1710,7 @@ class Page
*/
public function active()
{
$uri_path = rtrim(self::getGrav()['uri']->path(), '/');
$uri_path = rtrim(self::getGrav()['uri']->path(), '/') ?: '/';
$routes = self::getGrav()['pages']->routes();
if (isset($routes[$uri_path])) {

2
system/src/Grav/Common/Session.php
View File

@@ -45,7 +45,7 @@ class Session extends \RocketTheme\Toolbox\Session\Session
);
$unique_identifier = GRAV_ROOT;
$this->setName($config->get('system.session.name', 'grav_site') . '_' . substr(md5($unique_identifier), 0, 7) . ($is_admin ? '_admin' : ''));
$this->setName($config->get('system.session.name', 'grav_site') . '-' . substr(md5($unique_identifier), 0, 7) . ($is_admin ? '-admin' : ''));
$this->start();
setcookie(session_name(), session_id(), time() + $session_timeout, $session_path);
}