Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

FlexObject: Fixed a bug when updating media

Browse Source
This commit is contained in:
Matias Griese 2019-01-29 14:13:14 +02:00
parent f78658738a
commit 1321e582d5
2 changed files with 70 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
# v1.6.0-beta.9
## mm/dd/2019
1. [](#improved)
* Improved `$page->forms()` call, added `$page->addForms()`
# v1.6.0-beta.8
## 01/25/2019

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

@ -91,6 +91,8 @@ class Page implements PageInterface
protected $ssl;
protected $template_format;
protected $debugger;
/** @var array */
protected $forms;
/**
* @var Page Unmodified (original) version of the page. Used for copying and moving the page.
@ -1200,36 +1202,75 @@ class Page implements PageInterface
*/
public function forms()
{
$header = $this->header();
if (null === $this->forms) {
$header = $this->header();
// Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
$grav = Grav::instance();
$grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
// Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
$grav = Grav::instance();
$grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
$forms = [];
// First grab page.header.form
$form = $header->form ?? null;
if (\is_array($form)) {
$name = $form['name'] ?? $this->slug();
if ($form['name'] ?? null !== $name) {
$form['name'] = $name;
$rules = $header->rules ?? null;
if (!\is_array($rules)) {
$rules = [];
}
$forms[$name] = $form;
}
// Append page.header.forms (override singular form if it clashes)
if (isset($header->forms) && \is_array($header->forms)) {
foreach ($header->forms as $name => $form) {
if (\is_array($form)) {
$name = !\is_int($name) ? $name : ($form['name'] ?? $this->slug());
if ($form['name'] ?? null !== $name) {
$form['name'] = $name;
$forms = [];
// First grab page.header.form
$form = $this->normalizeForm($header->form ?? null, null, $rules);
if ($form) {
$forms[$form['name']] = $form;
}
// Append page.header.forms (override singular form if it clashes)
$headerForms = $header->forms ?? null;
if (\is_array($headerForms)) {
foreach ($headerForms as $name => $form) {
$form = $this->normalizeForm($form, $name, $rules);
if ($form) {
$forms[$form['name']] = $form;
}
$forms[$name] = $form;
}
}
$this->forms = $forms;
}
return $forms;
return $this->forms;
}
public function addForms(array $new)
{
// Initialize forms.
$this->forms();
foreach ($new as $form) {
$form = $this->normalizeForm($form);
if ($form) {
$this->forms[$form['name']] = $form;
}
}
}
protected function normalizeForm($form, $name = null, array $rules = [])
{
if (!\is_array($form)) {
return null;
}
// Ignore numeric indexes on name.
if (!$name || (string)(int)$name === (string)$name) {
$name = null;
}
$name = $name ?? $form['name'] ?? $this->slug();
$formRules = $form['rules'] ?? null;
if (!\is_array($formRules)) {
$formRules = [];
}
return ['name' => $name, 'rules' => $rules + $formRules] + $form;
}
/**
@ -2752,7 +2793,7 @@ class Page implements PageInterface
}
/** @var Grav $grav */
$grav = Grav::instance()['grav'];
$grav = Grav::instance();
// New Custom event to handle things like pagination.
$grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection]));