Update to Kirby 3.7.5
This commit is contained in:
@@ -177,7 +177,6 @@ class A
|
||||
}
|
||||
|
||||
foreach ($array2 as $key => $value) {
|
||||
|
||||
// append to the merged array, don't overwrite numeric keys
|
||||
if (is_int($key) === true && $mode === static::MERGE_APPEND) {
|
||||
$merged[] = $value;
|
||||
|
@@ -525,7 +525,6 @@ class Collection extends Iterator implements Countable
|
||||
*/
|
||||
public function group($field, bool $i = true)
|
||||
{
|
||||
|
||||
// group by field name
|
||||
if (is_string($field) === true) {
|
||||
return $this->group(function ($item) use ($field, $i) {
|
||||
@@ -541,7 +540,6 @@ class Collection extends Iterator implements Countable
|
||||
$groups = [];
|
||||
|
||||
foreach ($this->data as $key => $item) {
|
||||
|
||||
// get the value to group by
|
||||
$value = $field($item);
|
||||
|
||||
@@ -1005,7 +1003,6 @@ class Collection extends Iterator implements Countable
|
||||
$fields = [];
|
||||
|
||||
foreach ($args as $arg) {
|
||||
|
||||
// get the index of the latest field array inside the $fields array
|
||||
$currentField = $fields ? count($fields) - 1 : 0;
|
||||
|
||||
|
@@ -585,17 +585,17 @@ class Html extends Xml
|
||||
};
|
||||
|
||||
switch ($path->toString()) {
|
||||
// playlists
|
||||
case 'embed/videoseries':
|
||||
case 'playlist':
|
||||
// playlists
|
||||
if ($isYoutubeId($query->list) === true) {
|
||||
$src = $host . '/videoseries';
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
// regular video URLs
|
||||
case 'watch':
|
||||
// regular video URLs
|
||||
if ($isYoutubeId($query->v) === true) {
|
||||
$src = $host . '/' . $query->v;
|
||||
|
||||
|
@@ -81,7 +81,6 @@ class Pagination
|
||||
*/
|
||||
return $a;
|
||||
} elseif (is_array($a) === true) {
|
||||
|
||||
/**
|
||||
* First argument is an option array
|
||||
*
|
||||
@@ -89,7 +88,6 @@ class Pagination
|
||||
*/
|
||||
$params = $a;
|
||||
} elseif (is_int($a) === true && $b === null) {
|
||||
|
||||
/**
|
||||
* First argument is the limit
|
||||
*
|
||||
@@ -97,7 +95,6 @@ class Pagination
|
||||
*/
|
||||
$params['limit'] = $a;
|
||||
} elseif (is_int($a) === true && is_int($b) === true) {
|
||||
|
||||
/**
|
||||
* First argument is the limit,
|
||||
* second argument is the page
|
||||
@@ -107,7 +104,6 @@ class Pagination
|
||||
$params['limit'] = $a;
|
||||
$params['page'] = $b;
|
||||
} elseif (is_int($a) === true && is_array($b) === true) {
|
||||
|
||||
/**
|
||||
* First argument is the limit,
|
||||
* second argument are options
|
||||
|
@@ -122,7 +122,6 @@ trait Properties
|
||||
|
||||
// handle empty values
|
||||
if ($value === null) {
|
||||
|
||||
// replace null with a default value, if a default handler exists
|
||||
if (method_exists($this, 'default' . $name) === true) {
|
||||
$value = $this->{'default' . $name}();
|
||||
|
@@ -846,11 +846,9 @@ class Str
|
||||
if (is_int($replacement['limit']) === false) {
|
||||
throw new Exception('Invalid limit "' . $replacement['limit'] . '".');
|
||||
} elseif ($replacement['limit'] === -1) {
|
||||
|
||||
// no limit, we don't need our special replacement routine
|
||||
$string = str_replace($replacement['search'], $replacement['replace'], $string);
|
||||
} elseif ($replacement['limit'] > 0) {
|
||||
|
||||
// limit given, only replace for $replacement['limit'] times per replacement
|
||||
$position = -1;
|
||||
|
||||
|
Reference in New Issue
Block a user