hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2033 from alchemy-fr/4.0

Browse Source 
Port PHRAS-1292 in master
This commit is contained in:
Thibaud Fabre
2016-12-19 13:41:41 +01:00
committed by GitHub
parent 3547d33ba3 b151faaba7
commit cefb2f99f4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -23,6 +23,7 @@ clean_assets:
config: config:
@php bin/console compile:configuration @php bin/console compile:configuration
@php bin/developer orm:generate-proxies
watch: watch:
@echo 'config/configuration.yml' | entr make config @echo 'config/configuration.yml' | entr make config

8
lib/classes/media/Permalink/Adapter.php
View File

@@ -39,6 +39,12 @@ class media_Permalink_Adapter implements cache_cacheableInterface
/** @var Application */ /** @var Application */
protected $app; protected $app;
private static $bad_chars = [
"\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07",
"\x08", "\x09", "\x0A", "\x0B", "\x0C", "\x0D", "\x0E", "\x0F",
" ", "/", "\\", "%", "+"
];
/** /**
* @param Application $app * @param Application $app
* @param databox $databox * @param databox $databox
@@ -118,7 +124,7 @@ class media_Permalink_Adapter implements cache_cacheableInterface
'record_id' => $this->media_subdef->get_record_id(), 'record_id' => $this->media_subdef->get_record_id(),
'subdef' => $this->media_subdef->get_name(), 'subdef' => $this->media_subdef->get_name(),
/** @Ignore */ /** @Ignore */
'label' => str_replace('/', '_', $label), 'label' => str_replace(self::$bad_chars, '_', $label),
'token' => $this->get_token(), 'token' => $this->get_token(),
])); ]));
} }