From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 27 Dec 2018 06:47:53 +0000 (-0500)
Subject: Merge branch '2018.12-rc' into task/move-config-to-php-array
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fabc90e9dd5f1c4280a9bfa6c6930a3fc985f87a;p=friendica.git

Merge branch '2018.12-rc' into task/move-config-to-php-array
---

fabc90e9dd5f1c4280a9bfa6c6930a3fc985f87a
diff --cc mod/credits.php
index cfcc30b3e2,f397bdca70..56b7cd6618
--- a/mod/credits.php
+++ b/mod/credits.php
@@@ -12,8 -12,8 +12,8 @@@ use Friendica\Core\Renderer
  function credits_content()
  {
  	/* fill the page with credits */
 -	$credits_string = file_get_contents('util/credits.txt');
 +	$credits_string = file_get_contents('CREDITS.txt');
- 	$names = explode("\n", htmlspecialchars($credits_string));
+ 	$names = explode("\n", $credits_string);
  	$tpl = Renderer::getMarkupTemplate('credits.tpl');
  	return Renderer::replaceMacros($tpl, [
  		'$title'  => L10n::t('Credits'),