keii.dev / osu-web
the browser-facing portion of osu!
fork atom

Merge pull request #9964 from nanaya/urldecode-param-string

Fix sometimes passing null to urldecode

authored by bakaneko and committed by GitHub a3169873 b1345ba4

+2 -1
unified split
+2 -1
app/Libraries/Markdown/Osu/DocumentProcessor.php
··· 49 50 // The config value should come from route() call which means it's percent encoded 51 // but it'll be reused as parameter for another route() call so decode it here. 52 - $this->relativeUrlRoot = urldecode($this->config->get('osu_extension/relative_url_root')); 53 $fixWikiUrl = $this->config->get('osu_extension/fix_wiki_url'); 54 $generateToc = $this->config->get('osu_extension/generate_toc'); 55 $recordFirstImage = $this->config->get('osu_extension/record_first_image');
··· 49 50 // The config value should come from route() call which means it's percent encoded 51 // but it'll be reused as parameter for another route() call so decode it here. 52 + $relativeUrlRoot = $this->config->get('osu_extension/relative_url_root'); 53 + $this->relativeUrlRoot = $relativeUrlRoot === null ? null : urldecode($relativeUrlRoot); 54 $fixWikiUrl = $this->config->get('osu_extension/fix_wiki_url'); 55 $generateToc = $this->config->get('osu_extension/generate_toc'); 56 $recordFirstImage = $this->config->get('osu_extension/record_first_image');