FreshRSS
/
FreshRSS
mirror of https://github.com/FreshRSS/FreshRSS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unicode preg_split new line (#6247) 

fix https://github.com/FreshRSS/FreshRSS/issues/6236
https://php.net/reference.pcre.pattern.modifiers
This commit is contained in:
Alexandre Alapetite 2024-03-31 18:39:43 +02:00 committed by GitHub
parent 9d48121e05
commit 1fb0cdfd06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/ImportService.php
View File

@ -183,7 +183,7 @@ class FreshRSS_Import_Service {
if (isset($feed_elt['frss:filtersActionRead'])) {
$feed->_filtersAction(
'read',
preg_split('/\R/', $feed_elt['frss:filtersActionRead']) ?: []
preg_split('/\R/u', $feed_elt['frss:filtersActionRead']) ?: []
);
}
@ -268,7 +268,7 @@ class FreshRSS_Import_Service {
$curl_params[CURLOPT_FOLLOWLOCATION] = (bool)$feed_elt['frss:CURLOPT_FOLLOWLOCATION'];
}
if (isset($feed_elt['frss:CURLOPT_HTTPHEADER'])) {
$curl_params[CURLOPT_HTTPHEADER] = preg_split('/\R/', $feed_elt['frss:CURLOPT_HTTPHEADER']) ?: [];
$curl_params[CURLOPT_HTTPHEADER] = preg_split('/\R/u', $feed_elt['frss:CURLOPT_HTTPHEADER']) ?: [];
}
if (isset($feed_elt['frss:CURLOPT_MAXREDIRS'])) {
$curl_params[CURLOPT_MAXREDIRS] = (int)$feed_elt['frss:CURLOPT_MAXREDIRS'];

2
lib/Minz/Request.php
View File

@ -120,7 +120,7 @@ class Minz_Request {
*/
public static function paramTextToArray(string $key, array $default = []): array {
if (isset(self::$params[$key]) && is_string(self::$params[$key])) {
return preg_split('/\R/', self::$params[$key]) ?: [];
return preg_split('/\R/u', self::$params[$key]) ?: [];
}
return $default;
}