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

Merge branch '1.7' into feature/clockwork-twig

Browse Source
This commit is contained in:
Andy Miller
2019-05-29 09:48:32 +02:00
parent e01605de55 e0d1385061
commit 6caadc8396
6 changed files with 1433 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2824
system/blueprints/config/system.yaml
View File

File diff suppressed because it is too large Load Diff

1
system/config/system.yaml
View File

@@ -125,6 +125,7 @@ log:
debugger:
enabled: false # Enable Grav debugger and following settings
provider: debugbar # Debugger provider
shutdown:
close_connection: true # Close the connection before calling onShutdown(). false for debugging

4
system/defines.php
View File

@@ -8,8 +8,8 @@
// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.6.9');
define('GRAV_TESTING', false);
define('GRAV_VERSION', '1.7.0-dev');
define('GRAV_TESTING', true);
define('DS', '/');
if (!defined('GRAV_PHP_MIN')) {

14
system/src/Grav/Common/Debugger.php
View File

@@ -118,11 +118,15 @@ class Debugger
if ($this->enabled) {
$this->initialized = true;
// Clockwork initialization.
$this->clockwork = $clockwork = new Clockwork();
$clockwork = $debugbar = null;
// Debugbar initialization.
$this->debugbar = $debugbar = new DebugBar();
switch ($this->config->get('system.debugger.provider', 'debugbar')) {
case 'clockwork':
$this->clockwork = $clockwork = new Clockwork();
break;
default:
$this->debugbar = $debugbar = new DebugBar();
}
$plugins_config = (array)$this->config->get('plugins');
ksort($plugins_config);
@@ -169,7 +173,7 @@ class Debugger
$debugbar['time']->addMeasure('Site Setup', $this->currentTime, microtime(true));
}
$this->addMessage('Grav v' . GRAV_VERSION);
$this->addMessage('Grav v' . GRAV_VERSION . ' - PHP ' . PHP_VERSION);
$this->config->debug();
if ($clockwork) {

5
system/src/Grav/Common/Uri.php
View File

@@ -300,16 +300,17 @@ class Uri
* Get URI parameter.
*
* @param string $id
* @param bool $default
*
* @return bool|string
*/
public function param($id)
public function param($id, $default = false)
{
if (isset($this->params[$id])) {
return html_entity_decode(rawurldecode($this->params[$id]));
}
return false;
return $default;
}
/**

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

@@ -1260,7 +1260,7 @@ abstract class Utils
*/
public static function sortArrayByArray(array $array, array $orderArray)
{
$ordered = array();
$ordered = [];
foreach ($orderArray as $key) {
if (array_key_exists($key, $array)) {
$ordered[$key] = $array[$key];