瀏覽代碼

Unicode preg_split new line (#6247)

fix https://github.com/FreshRSS/FreshRSS/issues/6236
https://php.net/reference.pcre.pattern.modifiers
Alexandre Alapetite 2 年之前
父節點
當前提交
1fb0cdfd06
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      app/Services/ImportService.php
  2. 1 1
      lib/Minz/Request.php

+ 2 - 2
app/Services/ImportService.php

@@ -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'];

+ 1 - 1
lib/Minz/Request.php

@@ -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;
 	}