Fossil

Check-in [d253ece0]
Login

Check-in [d253ece0]

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

Overview
Comment:FIXME-comments in the code did not indicate issues and are now rephrased to be mere reminders.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | base-href-fix
Files: files | file ages | folders
SHA3-256: d253ece08a07b8b2877451a47e974237c5cd283eb56de831f81b4bdb31b051ce
User & Date: george 2022-02-15 21:35:19
Context
2022-02-15
21:35
FIXME-comments in the code did not indicate issues and are now rephrased to be mere reminders. ... (Leaf check-in: d253ece0 user: george tags: base-href-fix)
02:26
Do not override base href for wiki pages. This needs testing. ... (check-in: 89dd3451 user: george tags: base-href-fix)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/extcgi.c.

︙︙
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242

  if( nScript==0 ){
    zFailReason = "path does not match any file or script";
    goto ext_not_found;
  }
  assert( nScript>=nRoot+1 );
  style_set_current_page("ext/%s", &zScript[nRoot+1]);

  /* FIXME: a call to  style_set_base_href_suffix()  skipped
   * because we want #fragment links to work under /ext   */

  zMime = mimetype_from_name(zScript);
  if( zMime==0 ) zMime = "application/octet-stream";
  if( !file_isexe(zScript, ExtFILE) ){
    /* File is not executable.  Must be a regular file.  In that case,
    ** disallow extra path elements */
    if( zPath[nScript]!=0 ){








|
|








227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242

  if( nScript==0 ){
    zFailReason = "path does not match any file or script";
    goto ext_not_found;
  }
  assert( nScript>=nRoot+1 );
  style_set_current_page("ext/%s", &zScript[nRoot+1]);

  /* Overriding of base href disabled as part of 'base-href-fix' branch
  ** otherwise #fragment links may break under /ext  */

  zMime = mimetype_from_name(zScript);
  if( zMime==0 ) zMime = "application/octet-stream";
  if( !file_isexe(zScript, ExtFILE) ){
    /* File is not executable.  Must be a regular file.  In that case,
    ** disallow extra path elements */
    if( zPath[nScript]!=0 ){
︙︙

Changes to src/fossil.page.wikiedit.js.

︙︙
882
883
884
885
886
887
888
889
890


891
892
893
894
895
896
897

             move that button around to those tabs where it makes sense. */
          btnSlot.parentNode.insertBefore( P.e.btnSave.parentNode, btnSlot );
          btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot );
          P.updateSaveButton();
        }
        if(theTab===P.e.tabs.preview){

          /* FIXME: P.baseHrefForWiki();
          ** Overriding of base href disabled as part of 'base-href-fix' branch


          */
          if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview();
        }else if(theTab===P.e.tabs.diff){
          /* Work around a weird bug where the page gets wider than
             the window when the diff tab is NOT in view and the
             current SBS diff widget is wider than the window. When
             the diff IS in view then CSS overflow magically reduces








<
|
>
>








882
883
884
885
886
887
888

889
890
891
892
893
894
895
896
897
898

             move that button around to those tabs where it makes sense. */
          btnSlot.parentNode.insertBefore( P.e.btnSave.parentNode, btnSlot );
          btnSlot.parentNode.insertBefore( P.e.btnSaveClose.parentNode, btnSlot );
          P.updateSaveButton();
        }
        if(theTab===P.e.tabs.preview){


          /* Overriding of base href disabled as part of 'base-href-fix' branch
          ** To bring back the old behavior uncomment the following call
          ** P.baseHrefForWiki();
          */
          if(P.previewNeedsUpdate && P.e.cbAutoPreview.checked) P.preview();
        }else if(theTab===P.e.tabs.diff){
          /* Work around a weird bug where the page gets wider than
             the window when the diff tab is NOT in view and the
             current SBS diff widget is wider than the window. When
             the diff IS in view then CSS overflow magically reduces
︙︙
905
906
907
908
909
910
911
912
913


914
915
916
917
918
919
920

    );
    P.tabs.addEventListener(
      /* Set up auto-refresh of the preview tab... */
      'before-switch-from', function(ev){
        const theTab = ev.detail;
        if(theTab===P.e.tabs.preview){

          /* FIXME: P.baseHrefRestore();
          ** Overriding of base href disabled as part of 'base-href-fix' branch


          */
        }else if(theTab===P.e.tabs.diff){
          /* See notes in the before-switch-to handler. */
          D.addClass(P.e.diffTarget, 'hidden');
        }
      }
    );








<
|
>
>








906
907
908
909
910
911
912

913
914
915
916
917
918
919
920
921
922

    );
    P.tabs.addEventListener(
      /* Set up auto-refresh of the preview tab... */
      'before-switch-from', function(ev){
        const theTab = ev.detail;
        if(theTab===P.e.tabs.preview){


          /* Overriding of base href disabled as part of 'base-href-fix' branch
          ** To bring back the old behavior uncomment the following call
          ** P.baseHrefRestore();
          */
        }else if(theTab===P.e.tabs.diff){
          /* See notes in the before-switch-to handler. */
          D.addClass(P.e.diffTarget, 'hidden');
        }
      }
    );
︙︙

Changes to src/wiki.c.

︙︙
596
597
598
599
600
601
602
603
604


605
606
607
608
609
610
611

    if( g.perm.Hyperlink ){
      style_submenu_element("History", "%R/whistory?name=%T", zPageName);
    }
  }
  if( !isPopup ){
    style_set_current_page("%T?name=%T", g.zPath, zPageName);

    /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
    ** Overriding of base href disabled as part of 'base-href-fix' branch


    */
    wiki_page_header(WIKITYPE_UNKNOWN, zPageName, "");
    if( !noSubmenu ){
      wiki_standard_submenu(submenuFlags);
    }
  }
  if( zBody[0]==0 ){








<
|
>
>








596
597
598
599
600
601
602

603
604
605
606
607
608
609
610
611
612

    if( g.perm.Hyperlink ){
      style_submenu_element("History", "%R/whistory?name=%T", zPageName);
    }
  }
  if( !isPopup ){
    style_set_current_page("%T?name=%T", g.zPath, zPageName);


    /* Overriding of base href disabled as part of 'base-href-fix' branch
    ** To bring back the old behavior uncomment the following call
    ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
    */
    wiki_page_header(WIKITYPE_UNKNOWN, zPageName, "");
    if( !noSubmenu ){
      wiki_standard_submenu(submenuFlags);
    }
  }
  if( zBody[0]==0 ){
︙︙
1672
1673
1674
1675
1676
1677
1678
1679
1680


1681
1682
1683
1684
1685
1686
1687

  if( !isSandbox && P("cancel")!=0 ){
    manifest_destroy(pWiki);
    cgi_redirectf("wiki?name=%T", zPageName);
    return;
  }
  style_set_current_page("%T?name=%T", g.zPath, zPageName);

  /* FIXME: style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
  ** Overriding of base href disabled as part of 'base-href-fix' branch


  */
  style_set_current_feature("wiki");
  style_header("Append Comment To: %s", zPageName);
  if( !goodCaptcha ){
    @ <p class="generalError">Error: Incorrect security code.</p>
  }
  if( isSandbox ){








<
|
>
>








1673
1674
1675
1676
1677
1678
1679

1680
1681
1682
1683
1684
1685
1686
1687
1688
1689

  if( !isSandbox && P("cancel")!=0 ){
    manifest_destroy(pWiki);
    cgi_redirectf("wiki?name=%T", zPageName);
    return;
  }
  style_set_current_page("%T?name=%T", g.zPath, zPageName);


  /* Overriding of base href disabled as part of 'base-href-fix' branch
  ** To bring back the old behavior uncomment the following call
  ** style_set_base_href_suffix("%T?name=%T", g.zPath, zPageName);
  */
  style_set_current_feature("wiki");
  style_header("Append Comment To: %s", zPageName);
  if( !goodCaptcha ){
    @ <p class="generalError">Error: Incorrect security code.</p>
  }
  if( isSandbox ){
︙︙