franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
lutranf
2014-08-29 10:32:11 +02:00
parent 52d117316f
commit fd7e75bb46
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/databap.php
View File

@@ -1146,7 +1146,7 @@ class Databap extends PhpObject
$asTable['title'] = self::getTableFormat($asTable['title']); $asTable['title'] = self::getTableFormat($asTable['title']);
$asTable['description'] = self::getDescriptionFormat($asTable['description']); $asTable['description'] = self::getDescriptionFormat($asTable['description']);
$asTable['led'] = self::getDateFormat($asTable['led']); $asTable['led'] = self::getDateFormat($asTable['led']);
//$asTable['keywords'] = ToolBox::findReplaceLinks($asTable['description']); $asTable['formatted_keywords'] = ToolBox::findReplaceLinks($asTable['keywords']);
} }
return $asTable; return $asTable;
} }

2
index.php
View File

@@ -49,7 +49,7 @@ $asAttendees = isset($_REQUEST['attendees'])?$_REQUEST['attendees']:'';
$bFirstConn = isset($_GET['first_conn'])?$_GET['first_conn']:false; $bFirstConn = isset($_GET['first_conn'])?$_GET['first_conn']:false;
$iMessageId = isset($_GET['message_id'])?$_GET['message_id']:0; $iMessageId = isset($_GET['message_id'])?$_GET['message_id']:0;
$oItemId = isset($_REQUEST['id'])?$_REQUEST['id']:0; $oItemId = isset($_REQUEST['id'])?$_REQUEST['id']:0;
$sSystem = isset($_POST['id'])?$_POST['system']:0; $sSystem = isset($_POST['system'])?$_POST['system']:'';
$sResult = ''; $sResult = '';
//Launching application //Launching application