merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Fri, 29 Mar 2019 08:39:28 +0100
branchsync
changeset 34194d74b3f06a4a
parent 3413 206593c06991
parent 3417 a1cabfd63053
child 3420 60ed7ce30858
child 3421 d7fc3647f02b
merge
     1.1 --- a/src/pEpEngine.c	Thu Mar 28 13:44:04 2019 +0100
     1.2 +++ b/src/pEpEngine.c	Fri Mar 29 08:39:28 2019 +0100
     1.3 @@ -909,7 +909,7 @@
     1.4              else if (table_contains_column(_session, "identity", "timestamp") > 0) {
     1.5                  version = 8;
     1.6              }            
     1.7 -            if (table_contains_column(_session, "person", "is_pEp_user") > 0) {
     1.8 +            else if (table_contains_column(_session, "person", "is_pEp_user") > 0) {
     1.9                  version = 7;
    1.10              }            
    1.11              else if (table_contains_column(_session, "identity", "is_own") > 0) {