Fossil

Check-in [f0b91665]
Login

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

Overview
Comment:Revert unintended change that snuck in alongside prior merge
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | andygoth-timeline-ms
Files: files | file ages | folders
SHA1: f0b91665aba525ef3b294f68106334194e4aa772
User & Date: andygoth 2016-11-04 15:12:22
Context
2016-11-04
15:48
Move GLOB before LIKE in list of possible match styles check-in: fc25a127 user: andygoth tags: andygoth-timeline-ms
15:12
Revert unintended change that snuck in alongside prior merge check-in: f0b91665 user: andygoth tags: andygoth-timeline-ms
15:09
Merge trunk check-in: 490daed2 user: andygoth tags: andygoth-timeline-ms
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
    zTagSql = tagMatchExpression(matchStyle, zThisTag, &tagMatchCount);
  }

  if( zTagName && g.perm.Read ){
    style_submenu_element("Related", "Related", "%s",
                          url_render(&url, "r", zTagName, "t", 0));
  }else if( zBrName && g.perm.Read ){
    style_submenu_element("Omit Related", "only", "%s",
                          url_render(&url, "t", zBrName, "r", 0));
  }
  if( zMark && zMark[0]==0 ){
    if( zAfter ) zMark = zAfter;
    if( zBefore ) zMark = zBefore;
    if( zCirca ) zMark = zCirca;
  }







|







1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
    zTagSql = tagMatchExpression(matchStyle, zThisTag, &tagMatchCount);
  }

  if( zTagName && g.perm.Read ){
    style_submenu_element("Related", "Related", "%s",
                          url_render(&url, "r", zTagName, "t", 0));
  }else if( zBrName && g.perm.Read ){
    style_submenu_element("Branch Only", "only", "%s",
                          url_render(&url, "t", zBrName, "r", 0));
  }
  if( zMark && zMark[0]==0 ){
    if( zAfter ) zMark = zAfter;
    if( zBefore ) zMark = zBefore;
    if( zCirca ) zMark = zCirca;
  }