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

Merge branches 'develop' and 'feature/multilang' of github.com:getgrav/grav into feature/multilang

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matias Griese 2019-06-27 18:10:36 +03:00
commit e7b996104f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@
* Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
* Fixed `Language::getFallbackPageExtensions()` to append `.md` file after the default language extension
* Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
* Fixed error when calling `Media::add($name, null)`
# v1.6.11
## 06/21/2019

3
system/src/Grav/Common/Page/Medium/AbstractMedia.php
View File

@ -154,6 +154,9 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac
*/
public function add($name, $file)
{
if (!$file) {
return;
}
$this->offsetSet($name, $file);
switch ($file->type) {
case 'image':