Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-07 17:21:49 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'release/0.9.37'

Browse Source
This commit is contained in:
Andy Miller
2015-08-12 06:31:53 -06:00
parent 0bccaf5458 38a7b0d7ab
commit c13daf7780
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,3 +1,10 @@
# v0.9.37
## 08/12/2015
3. [](#bugfix)
* Fixed issue when saving `header.process` in page forms via the **admin plugin**
* Fixed error due to use of `set_time_limit` that might be disabled on some hosts
# v0.9.36
## 08/11/2015

2
system/defines.php
View File

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

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

@@ -232,10 +232,10 @@ class Page
$this->menu = trim($this->header->menu);
}
if (isset($this->header->routable)) {
$this->routable = $this->header->routable;
$this->routable = (bool) $this->header->routable;
}
if (isset($this->header->visible)) {
$this->visible = $this->header->visible;
$this->visible = (bool) $this->header->visible;
}
if (isset($this->header->order_dir)) {
$this->order_dir = trim($this->header->order_dir);
@@ -253,7 +253,7 @@ class Page
$this->markdown_extra = (bool)$this->header->markdown_extra;
}
if (isset($this->header->taxonomy)) {
foreach ($this->header->taxonomy as $taxonomy => $taxitems) {
foreach ((array) $this->header->taxonomy as $taxonomy => $taxitems) {
$this->taxonomy[$taxonomy] = (array)$taxitems;
}
}
@@ -261,12 +261,12 @@ class Page
$this->max_count = intval($this->header->max_count);
}
if (isset($this->header->process)) {
foreach ($this->header->process as $process => $status) {
$this->process[$process] = $status;
foreach ((array) $this->header->process as $process => $status) {
$this->process[$process] = (bool) $status;
}
}
if (isset($this->header->published)) {
$this->published = $this->header->published;
$this->published = (bool) $this->header->published;
}
if (isset($this->header->publish_date)) {
$this->publish_date = strtotime($this->header->publish_date);
@@ -278,10 +278,10 @@ class Page
$this->expires = intval($this->header->expires);
}
if (isset($this->header->etag)) {
$this->etag = (bool)$this->header->etag;
$this->etag = (bool) $this->header->etag;
}
if (isset($this->header->last_modified)) {
$this->last_modified = (bool)$this->header->last_modified;
$this->last_modified = (bool) $this->header->last_modified;
}
}

6
system/src/Grav/Common/Utils.php
View File

@@ -219,7 +219,11 @@ abstract class Utils
$file_parts = pathinfo($file);
$filesize = filesize($file);
set_time_limit(0);
// check if this function is available, if so use it to stop any timeouts
if (function_exists('set_time_limit')) {
set_time_limit(0);
}
ignore_user_abort(false);
if ($force_download) {