nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3441 from annando/1705-bugfix-delete

Browse source 
Wrong parameter for delete command
This commit is contained in:
Tobias Diekershoff 2017-05-07 10:37:14 +02:00 committed by GitHub
parent b3faf3867d 054e40de65
commit 76d8a3213f
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.2-dev' ); define ( 'FRIENDICA_VERSION', '3.5.2-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1223 ); define ( 'DB_UPDATE_VERSION', 1224 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

4
include/dba.php
View file

@ -886,7 +886,7 @@ class dba {
logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA); logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA);
if (!self::e($sql, $param)) { if (!self::e($sql, $command['param'])) {
self::p("ROLLBACK"); self::p("ROLLBACK");
return false; return false;
} }
@ -914,7 +914,7 @@ class dba {
logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA); logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA);
if (!self::e($sql, $param)) { if (!self::e($sql, $field_values)) {
self::p("ROLLBACK"); self::p("ROLLBACK");
return false; return false;
} }

2
include/dbstructure.php
View file

@ -1218,6 +1218,7 @@ function db_definition() {
"convid" => array("convid"), "convid" => array("convid"),
"uri" => array("uri(64)"), "uri" => array("uri(64)"),
"parent-uri" => array("parent-uri(64)"), "parent-uri" => array("parent-uri(64)"),
"contactid" => array("contact-id"),
) )
); );
$database["mailacct"] = array( $database["mailacct"] = array(
@ -1355,6 +1356,7 @@ function db_definition() {
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
"contactid" => array("contact-id"),
"uid_contactid" => array("uid", "contact-id"), "uid_contactid" => array("uid", "contact-id"),
"uid_profile" => array("uid", "profile"), "uid_profile" => array("uid", "profile"),
"uid_album_scale_created" => array("uid", "album(32)", "scale", "created"), "uid_album_scale_created" => array("uid", "album(32)", "scale", "created"),

2
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define('UPDATE_VERSION' , 1223); define('UPDATE_VERSION' , 1224);
/** /**
* *