Explorar el Código

formats: Fix favicon not found if url contains path

logmanoriginal hace 5 años
padre
commit
42c699f474
Se han modificado 2 ficheros con 6 adiciones y 2 borrados
  1. 4 1
      formats/AtomFormat.php
  2. 2 1
      formats/MrssFormat.php

+ 4 - 1
formats/AtomFormat.php

@@ -16,7 +16,10 @@ class AtomFormat extends FormatAbstract{
 		$extraInfos = $this->getExtraInfos();
 		$title = $this->xml_encode($extraInfos['name']);
 		$uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/RSS-Bridge/rss-bridge';
-		$icon = $this->xml_encode($uri .'/favicon.ico');
+
+		$uriparts = parse_url($uri);
+		$icon = $this->xml_encode($uriparts['scheme'] . '://' . $uriparts['host'] .'/favicon.ico');
+
 		$uri = $this->xml_encode($uri);
 
 		$entries = '';

+ 2 - 1
formats/MrssFormat.php

@@ -21,7 +21,8 @@ class MrssFormat extends FormatAbstract {
 			$uri = 'https://github.com/RSS-Bridge/rss-bridge';
 		}
 
-		$icon = $this->xml_encode($uri .'/favicon.ico');
+		$uriparts = parse_url($uri);
+		$icon = $this->xml_encode($uriparts['scheme'] . '://' . $uriparts['host'] .'/favicon.ico');
 
 		$items = '';
 		foreach($this->getItems() as $item) {