Fossil SCM
If the dp= and r= query parameters are both supplied to /timeline, use only the r= query parameter and ignore dp=.
Commit
7c690c08967c235d2edf89004c6a9dc6914e0887b6217d7060b6224ad888604c
Parent
802939b18d433e3…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1661,11 +1661,11 @@ | ||
| 1661 | 1661 | db_int(0, "SELECT count(*) FROM timeline")); |
| 1662 | 1662 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom); |
| 1663 | 1663 | blob_append(&desc, " to ", -1); |
| 1664 | 1664 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo); |
| 1665 | 1665 | addFileGlobDescription(zChng, &desc); |
| 1666 | - }else if( (p_rid || d_rid) && g.perm.Read ){ | |
| 1666 | + }else if( (p_rid || d_rid) && g.perm.Read && zTagSql==0 ){ | |
| 1667 | 1667 | /* If p= or d= is present, ignore all other parameters other than n= */ |
| 1668 | 1668 | char *zUuid; |
| 1669 | 1669 | int np, nd; |
| 1670 | 1670 | |
| 1671 | 1671 | tmFlags |= TIMELINE_DISJOINT; |
| 1672 | 1672 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1661,11 +1661,11 @@ | |
| 1661 | db_int(0, "SELECT count(*) FROM timeline")); |
| 1662 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom); |
| 1663 | blob_append(&desc, " to ", -1); |
| 1664 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo); |
| 1665 | addFileGlobDescription(zChng, &desc); |
| 1666 | }else if( (p_rid || d_rid) && g.perm.Read ){ |
| 1667 | /* If p= or d= is present, ignore all other parameters other than n= */ |
| 1668 | char *zUuid; |
| 1669 | int np, nd; |
| 1670 | |
| 1671 | tmFlags |= TIMELINE_DISJOINT; |
| 1672 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1661,11 +1661,11 @@ | |
| 1661 | db_int(0, "SELECT count(*) FROM timeline")); |
| 1662 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom); |
| 1663 | blob_append(&desc, " to ", -1); |
| 1664 | blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo); |
| 1665 | addFileGlobDescription(zChng, &desc); |
| 1666 | }else if( (p_rid || d_rid) && g.perm.Read && zTagSql==0 ){ |
| 1667 | /* If p= or d= is present, ignore all other parameters other than n= */ |
| 1668 | char *zUuid; |
| 1669 | int np, nd; |
| 1670 | |
| 1671 | tmFlags |= TIMELINE_DISJOINT; |
| 1672 |