Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:If the dp= and r= query parameters are both supplied to /timeline, use only the r= query parameter and ignore dp=.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:7c690c08967c235d2edf89004c6a9dc6914e0887b6217d7060b6224ad888604c
User & Date: drh 2018-03-19 20:24:25
Context
2018-03-20
17:08
The markdown processor should use the Fossil memory allocation routines. check-in: e382cae5 user: mistachkin tags: trunk
2018-03-19
20:24
If the dp= and r= query parameters are both supplied to /timeline, use only the r= query parameter and ignore dp=. check-in: 7c690c08 user: drh tags: trunk
2018-03-17
23:11
Do no update the display cookie except when the user specifically changes the selectors on the /timeline submenu. check-in: 802939b1 user: drh tags: trunk
Changes

Changes to src/timeline.c.

1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
    }
    blob_appendf(&desc, "%d check-ins going from ",
                 db_int(0, "SELECT count(*) FROM timeline"));
    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
    blob_append(&desc, " to ", -1);
    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
    addFileGlobDescription(zChng, &desc);
  }else if( (p_rid || d_rid) && g.perm.Read ){
    /* If p= or d= is present, ignore all other parameters other than n= */
    char *zUuid;
    int np, nd;

    tmFlags |= TIMELINE_DISJOINT;
    if( p_rid && d_rid ){
      if( p_rid!=d_rid ) p_rid = d_rid;







|







1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
    }
    blob_appendf(&desc, "%d check-ins going from ",
                 db_int(0, "SELECT count(*) FROM timeline"));
    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
    blob_append(&desc, " to ", -1);
    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
    addFileGlobDescription(zChng, &desc);
  }else if( (p_rid || d_rid) && g.perm.Read && zTagSql==0 ){
    /* If p= or d= is present, ignore all other parameters other than n= */
    char *zUuid;
    int np, nd;

    tmFlags |= TIMELINE_DISJOINT;
    if( p_rid && d_rid ){
      if( p_rid!=d_rid ) p_rid = d_rid;