Fossil SCM
Prevent the 'setParameter' TH1 command from creating duplicate query parameters.
Commit
617eeaecf844b8335b560e0a8ecfbc5cf6a8269e
Parent
40c11955383fcc0…
2 files changed
+1
-1
+16
-1
+1
-1
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -661,11 +661,11 @@ | ||
| 661 | 661 | int *argl |
| 662 | 662 | ){ |
| 663 | 663 | if( argc!=3 ){ |
| 664 | 664 | return Th_WrongNumArgs(interp, "setParameter NAME VALUE"); |
| 665 | 665 | } |
| 666 | - cgi_set_parameter(argv[1], argv[2]); | |
| 666 | + cgi_replace_parameter(mprintf("%s", argv[1]), mprintf("%s", argv[2])); | |
| 667 | 667 | return TH_OK; |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | /* |
| 671 | 671 | ** TH1 command: render STRING |
| 672 | 672 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -661,11 +661,11 @@ | |
| 661 | int *argl |
| 662 | ){ |
| 663 | if( argc!=3 ){ |
| 664 | return Th_WrongNumArgs(interp, "setParameter NAME VALUE"); |
| 665 | } |
| 666 | cgi_set_parameter(argv[1], argv[2]); |
| 667 | return TH_OK; |
| 668 | } |
| 669 | |
| 670 | /* |
| 671 | ** TH1 command: render STRING |
| 672 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -661,11 +661,11 @@ | |
| 661 | int *argl |
| 662 | ){ |
| 663 | if( argc!=3 ){ |
| 664 | return Th_WrongNumArgs(interp, "setParameter NAME VALUE"); |
| 665 | } |
| 666 | cgi_replace_parameter(mprintf("%s", argv[1]), mprintf("%s", argv[2])); |
| 667 | return TH_OK; |
| 668 | } |
| 669 | |
| 670 | /* |
| 671 | ** TH1 command: render STRING |
| 672 |
+16
-1
| --- test/th1.test | ||
| +++ test/th1.test | ||
| @@ -589,7 +589,22 @@ | ||
| 589 | 589 | fossil test-th-eval "setParameter test2 value2; getParameter test1" |
| 590 | 590 | test th1-set-parameter-3 {$RESULT eq {}} |
| 591 | 591 | |
| 592 | 592 | ############################################################################### |
| 593 | 593 | |
| 594 | -fossil test-th-eval "setParameter test3 value3; getParameter test3 defValue3" | |
| 594 | +fossil test-th-eval "setParameter test3 value3; getParameter test3" | |
| 595 | 595 | test th1-set-parameter-4 {$RESULT eq {value3}} |
| 596 | + | |
| 597 | +############################################################################### | |
| 598 | + | |
| 599 | +fossil test-th-eval "setParameter test3 value3; getParameter test3 defValue3" | |
| 600 | +test th1-set-parameter-5 {$RESULT eq {value3}} | |
| 601 | + | |
| 602 | +############################################################################### | |
| 603 | + | |
| 604 | +fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4" | |
| 605 | +test th1-set-parameter-6 {$RESULT eq {value5}} | |
| 606 | + | |
| 607 | +############################################################################### | |
| 608 | + | |
| 609 | +fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4 defValue4" | |
| 610 | +test th1-set-parameter-7 {$RESULT eq {value5}} | |
| 596 | 611 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -589,7 +589,22 @@ | |
| 589 | fossil test-th-eval "setParameter test2 value2; getParameter test1" |
| 590 | test th1-set-parameter-3 {$RESULT eq {}} |
| 591 | |
| 592 | ############################################################################### |
| 593 | |
| 594 | fossil test-th-eval "setParameter test3 value3; getParameter test3 defValue3" |
| 595 | test th1-set-parameter-4 {$RESULT eq {value3}} |
| 596 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -589,7 +589,22 @@ | |
| 589 | fossil test-th-eval "setParameter test2 value2; getParameter test1" |
| 590 | test th1-set-parameter-3 {$RESULT eq {}} |
| 591 | |
| 592 | ############################################################################### |
| 593 | |
| 594 | fossil test-th-eval "setParameter test3 value3; getParameter test3" |
| 595 | test th1-set-parameter-4 {$RESULT eq {value3}} |
| 596 | |
| 597 | ############################################################################### |
| 598 | |
| 599 | fossil test-th-eval "setParameter test3 value3; getParameter test3 defValue3" |
| 600 | test th1-set-parameter-5 {$RESULT eq {value3}} |
| 601 | |
| 602 | ############################################################################### |
| 603 | |
| 604 | fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4" |
| 605 | test th1-set-parameter-6 {$RESULT eq {value5}} |
| 606 | |
| 607 | ############################################################################### |
| 608 | |
| 609 | fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4 defValue4" |
| 610 | test th1-set-parameter-7 {$RESULT eq {value5}} |
| 611 |