From fd7e75bb4631173db8fd338bf4bb3158ed960550 Mon Sep 17 00:00:00 2001 From: lutranf Date: Fri, 29 Aug 2014 10:32:11 +0200 Subject: [PATCH] fix conflict --- inc/databap.php | 2 +- index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/databap.php b/inc/databap.php index 38f4065..279a40d 100644 --- a/inc/databap.php +++ b/inc/databap.php @@ -1146,7 +1146,7 @@ class Databap extends PhpObject $asTable['title'] = self::getTableFormat($asTable['title']); $asTable['description'] = self::getDescriptionFormat($asTable['description']); $asTable['led'] = self::getDateFormat($asTable['led']); - //$asTable['keywords'] = ToolBox::findReplaceLinks($asTable['description']); + $asTable['formatted_keywords'] = ToolBox::findReplaceLinks($asTable['keywords']); } return $asTable; } diff --git a/index.php b/index.php index d881959..b9bc769 100644 --- a/index.php +++ b/index.php @@ -49,7 +49,7 @@ $asAttendees = isset($_REQUEST['attendees'])?$_REQUEST['attendees']:''; $bFirstConn = isset($_GET['first_conn'])?$_GET['first_conn']:false; $iMessageId = isset($_GET['message_id'])?$_GET['message_id']:0; $oItemId = isset($_REQUEST['id'])?$_REQUEST['id']:0; -$sSystem = isset($_POST['id'])?$_POST['system']:0; +$sSystem = isset($_POST['system'])?$_POST['system']:''; $sResult = ''; //Launching application