Fossil SCM
Remove a duplicated query.
Commit
4332ba5d37de55d8d8e947b92e09b11690f721faf755aabe63d44f5fc348d035
Parent
22b648e9e5893ee…
1 file changed
+2
-2
+2
-2
| --- src/setupuser.c | ||
| +++ src/setupuser.c | ||
| @@ -357,11 +357,11 @@ | ||
| 357 | 357 | ** Don't allow that. |
| 358 | 358 | */ |
| 359 | 359 | zId = PD("id", "0"); |
| 360 | 360 | uid = atoi(zId); |
| 361 | 361 | if( uid>0 ){ |
| 362 | - zOldCaps = db_text(0, "SELECT cap FROM user WHERE uid=%d",uid); | |
| 362 | + zOldCaps = db_text("", "SELECT cap FROM user WHERE uid=%d",uid); | |
| 363 | 363 | if( zId && !g.perm.Setup ){ |
| 364 | 364 | higherUser = zOldCaps && strchr(zOldCaps,'s'); |
| 365 | 365 | } |
| 366 | 366 | } |
| 367 | 367 | |
| @@ -561,13 +561,13 @@ | ||
| 561 | 561 | zPw = ""; |
| 562 | 562 | for(i='a'; i<='z'; i++) oa[i] = ""; |
| 563 | 563 | for(i='0'; i<='9'; i++) oa[i] = ""; |
| 564 | 564 | for(i='A'; i<='Z'; i++) oa[i] = ""; |
| 565 | 565 | if( uid ){ |
| 566 | + assert( zCap ); | |
| 566 | 567 | zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid); |
| 567 | 568 | zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid); |
| 568 | - zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid); | |
| 569 | 569 | zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid); |
| 570 | 570 | for(i=0; zCap[i]; i++){ |
| 571 | 571 | char c = zCap[i]; |
| 572 | 572 | if( (c>='a' && c<='z') || (c>='0' && c<='9') || (c>='A' && c<='Z') ){ |
| 573 | 573 | oa[c&0x7f] = " checked=\"checked\""; |
| 574 | 574 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -357,11 +357,11 @@ | |
| 357 | ** Don't allow that. |
| 358 | */ |
| 359 | zId = PD("id", "0"); |
| 360 | uid = atoi(zId); |
| 361 | if( uid>0 ){ |
| 362 | zOldCaps = db_text(0, "SELECT cap FROM user WHERE uid=%d",uid); |
| 363 | if( zId && !g.perm.Setup ){ |
| 364 | higherUser = zOldCaps && strchr(zOldCaps,'s'); |
| 365 | } |
| 366 | } |
| 367 | |
| @@ -561,13 +561,13 @@ | |
| 561 | zPw = ""; |
| 562 | for(i='a'; i<='z'; i++) oa[i] = ""; |
| 563 | for(i='0'; i<='9'; i++) oa[i] = ""; |
| 564 | for(i='A'; i<='Z'; i++) oa[i] = ""; |
| 565 | if( uid ){ |
| 566 | zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid); |
| 567 | zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid); |
| 568 | zCap = db_text("", "SELECT cap FROM user WHERE uid=%d", uid); |
| 569 | zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid); |
| 570 | for(i=0; zCap[i]; i++){ |
| 571 | char c = zCap[i]; |
| 572 | if( (c>='a' && c<='z') || (c>='0' && c<='9') || (c>='A' && c<='Z') ){ |
| 573 | oa[c&0x7f] = " checked=\"checked\""; |
| 574 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -357,11 +357,11 @@ | |
| 357 | ** Don't allow that. |
| 358 | */ |
| 359 | zId = PD("id", "0"); |
| 360 | uid = atoi(zId); |
| 361 | if( uid>0 ){ |
| 362 | zOldCaps = db_text("", "SELECT cap FROM user WHERE uid=%d",uid); |
| 363 | if( zId && !g.perm.Setup ){ |
| 364 | higherUser = zOldCaps && strchr(zOldCaps,'s'); |
| 365 | } |
| 366 | } |
| 367 | |
| @@ -561,13 +561,13 @@ | |
| 561 | zPw = ""; |
| 562 | for(i='a'; i<='z'; i++) oa[i] = ""; |
| 563 | for(i='0'; i<='9'; i++) oa[i] = ""; |
| 564 | for(i='A'; i<='Z'; i++) oa[i] = ""; |
| 565 | if( uid ){ |
| 566 | assert( zCap ); |
| 567 | zLogin = db_text("", "SELECT login FROM user WHERE uid=%d", uid); |
| 568 | zInfo = db_text("", "SELECT info FROM user WHERE uid=%d", uid); |
| 569 | zPw = db_text("", "SELECT pw FROM user WHERE uid=%d", uid); |
| 570 | for(i=0; zCap[i]; i++){ |
| 571 | char c = zCap[i]; |
| 572 | if( (c>='a' && c<='z') || (c>='0' && c<='9') || (c>='A' && c<='Z') ){ |
| 573 | oa[c&0x7f] = " checked=\"checked\""; |
| 574 |