Merge branch 'release/0.9.39'

getgrav · Aug 25, 2015 · cb074af · cb074af
2 parents 795268a + 7e3226e
commit cb074af
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/system/defines.php b/system/defines.php
@@ -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

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -1710,7 +1710,7 @@ public function adjacentSibling($direction = 1)
      */
     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])) {

diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
@@ -45,7 +45,7 @@ public function init()
             );
 
             $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);
         }