Fossil

Check-in [22e20511]
Login

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

Overview
Comment:Adjust the $current_page for the doc webpage so that it includes the embedded document being rendered.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:22e2051111a2e5d4d718fe691d30a6567175b80a
User & Date: drh 2012-08-13 12:39:18
Context
2012-08-13
16:18
Have the "raw" webpage try to guess the filename and the mimetype of the artifact being downloaded, if the m= query parameter is omitted. check-in: af16836c user: drh tags: trunk
12:39
Adjust the $current_page for the doc webpage so that it includes the embedded document being rendered. check-in: 22e20511 user: drh tags: trunk
2012-08-10
12:59
Allow the style= attribute in wiki markup. check-in: 717cd278 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/doc.c.

368
369
370
371
372
373
374

375
376
377
378
379
380
381
  if( !g.perm.Read ){ login_needed(); return; }
  zName = PD("name", "tip/index.wiki");
  for(i=0; zName[i] && zName[i]!='/'; i++){}
  if( zName[i]==0 || i>UUID_SIZE ){
    zName = "index.html";
    goto doc_not_found;
  }

  memcpy(zBaseline, zName, i);
  zBaseline[i] = 0;
  zName += i;
  while( zName[0]=='/' ){ zName++; }
  if( !file_is_simple_pathname(zName) ){
    int n = strlen(zName);
    if( n>0 && zName[n-1]=='/' ){







>







368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
  if( !g.perm.Read ){ login_needed(); return; }
  zName = PD("name", "tip/index.wiki");
  for(i=0; zName[i] && zName[i]!='/'; i++){}
  if( zName[i]==0 || i>UUID_SIZE ){
    zName = "index.html";
    goto doc_not_found;
  }
  g.zPath = mprintf("%s/%s", g.zPath, zName);
  memcpy(zBaseline, zName, i);
  zBaseline[i] = 0;
  zName += i;
  while( zName[0]=='/' ){ zName++; }
  if( !file_is_simple_pathname(zName) ){
    int n = strlen(zName);
    if( n>0 && zName[n-1]=='/' ){