keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for issue "Field 'type' doesn't have a default value" in the challenge table.

Browse source
This commit is contained in:
Michael Vogel 2014-11-08 20:52:15 +01:00
parent d81289c58b
commit 030784ad35
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/dfrn_notify.php
View file

@ -175,6 +175,8 @@ function dfrn_notify_content(&$a) {
$dfrn_id = notags(trim($_GET['dfrn_id'])); $dfrn_id = notags(trim($_GET['dfrn_id']));
$dfrn_version = (float) $_GET['dfrn_version']; $dfrn_version = (float) $_GET['dfrn_version'];
$type = "";
$last_update = "";
logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id);
@ -190,11 +192,13 @@ function dfrn_notify_content(&$a) {
$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time())); $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` ) $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
VALUES( '%s', '%s', %d ) ", VALUES( '%s', '%s', %d ) ",
dbesc($hash), dbesc($hash),
dbesc($dfrn_id), dbesc($dfrn_id),
intval(time() + 90 ) intval(time() + 90 ),
dbesc($type),
dbesc($last_update)
); );
logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG ); logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG );

2
mod/dfrn_poll.php
View file

@ -389,7 +389,7 @@ function dfrn_poll_content(&$a) {
$sec = ((x($_GET,'sec')) ? $_GET['sec'] : ''); $sec = ((x($_GET,'sec')) ? $_GET['sec'] : '');
$dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0); $dfrn_version = ((x($_GET,'dfrn_version')) ? (float) $_GET['dfrn_version'] : 2.0);
$perm = ((x($_GET,'perm')) ? $_GET['perm'] : 'r'); $perm = ((x($_GET,'perm')) ? $_GET['perm'] : 'r');
$quiet = ((x($_GET,'quiet')) ? true : false); $quiet = ((x($_GET,'quiet')) ? true : false);
$direction = (-1); $direction = (-1);
if(strpos($dfrn_id,':') == 1) { if(strpos($dfrn_id,':') == 1) {