From 5807fd0f43399a41b7b5eb1bbf8cd3d52e789789 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 16 Nov 2017 09:56:05 -0700
Subject: [PATCH] * InfoLog/PHP7.1: fix fatal error stalling merge-print of
 some InfoLog templates under PHP 7.1+ Make prefix argument optional

---
 api/src/Storage/Merge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 85d41edfdf..383c394046 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1421,7 +1421,7 @@ abstract class Merge
 	 * @param string $content
 	 * @return array
 	 */
-	protected function get_app_replacements($app, $id, $content, $prefix)
+	protected function get_app_replacements($app, $id, $content, $prefix='')
 	{
 		$replacements = array();
 		if($app == 'addressbook')