Fossil

Check-in [c440011b74]
Login

Check-in [c440011b74]

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

Overview
Comment:A pikchr error output formatting fix, per [forum:e167e2e622|forum post e167e2e622], and an unrelated typo fix.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c440011b74eb591d463707c30f3647694446b24a4bbc88bd1c55e89038541d3d
User & Date: stephan 2021-10-18 08:13:06
Context
2021-10-18
11:11
/wikiappend: removed ability to append to sandbox (wikiedit long since removed that capability). Fixed selection of mimetype name for text/plain pages. Moved permissions check to the top of the function. Largely based on suggestions from [forum:0acfdaac80|forum post 0acfdaac80]. ... (check-in: 202cbcf015 user: stephan tags: trunk)
08:13
A pikchr error output formatting fix, per [forum:e167e2e622|forum post e167e2e622], and an unrelated typo fix. ... (check-in: c440011b74 user: stephan tags: trunk)
2021-10-16
06:59
In the default ticket view, add a SPAN with CSS class tktDspCommenter around the commenter's name, per suggestion in [forum:491ed22f44|forum post 491ed22f44]. ... (check-in: 9f53093dca user: stephan tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/pivot.c.

︙︙
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74


/*
** Set a secondary file.  The primary file must be set first.  There
** must be at least one secondary but there can be more than one if
** desired.
*/
void pivot_set_secondary(int rid){
  /* Insert the primary record */
  db_multi_exec(
    "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
    "  SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'",
    rid, rid
  );
}









|








60
61
62
63
64
65
66
67
68
69
70
71
72
73
74


/*
** Set a secondary file.  The primary file must be set first.  There
** must be at least one secondary but there can be more than one if
** desired.
*/
void pivot_set_secondary(int rid){
  /* Insert the secondary record */
  db_multi_exec(
    "INSERT OR IGNORE INTO aqueue(rid, mtime, pending, src)"
    "  SELECT %d, mtime, 1, 0 FROM event WHERE objid=%d AND type='ci'",
    rid, rid
  );
}
︙︙

Changes to src/wiki.c.

︙︙
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224

    int w, h;
    char *zOut = pikchr(zPikchr, "pikchr", 0, &w, &h);
    if( w>0 ){
      @ <div class="pikchr-svg" style="max-width:%d(w)px">
      @ %s(zOut)
      @ </div>
    }else{
      @ <pre class='error'>\n">
      @ %s(zOut);
      @ </pre>
    }
    free(zOut);
  }else{
    @ <pre class='textPlain'>
    @ %h(blob_str(pWiki))
    @ </pre>








|
|








209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224

    int w, h;
    char *zOut = pikchr(zPikchr, "pikchr", 0, &w, &h);
    if( w>0 ){
      @ <div class="pikchr-svg" style="max-width:%d(w)px">
      @ %s(zOut)
      @ </div>
    }else{
      @ <pre class='error'>
      @ %h(zOut)
      @ </pre>
    }
    free(zOut);
  }else{
    @ <pre class='textPlain'>
    @ %h(blob_str(pWiki))
    @ </pre>
︙︙