Fossil SCM
Omit all of the submenu when a wiki page is shown using the /home URL. [forum:/forumpost/5010f8f2d35c8024|Forum post 5010f8f2d35c8024].
Commit
da2f1522db2a4172aae815a52725b37f4f404f1cf8384ffba67cb7e9d4c16d77
Parent
d6759551fb22fbf…
1 file changed
+2
-2
+2
-2
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -545,11 +545,11 @@ | ||
| 545 | 545 | Manifest *pWiki = 0; |
| 546 | 546 | const char *zPageName; |
| 547 | 547 | const char *zMimetype = 0; |
| 548 | 548 | int isPopup = P("popup")!=0; |
| 549 | 549 | char *zBody = mprintf("%s","<i>Empty Page</i>"); |
| 550 | - int noSubmenu = P("nsm")!=0; | |
| 550 | + int noSubmenu = P("nsm")!=0 || g.isHome; | |
| 551 | 551 | |
| 552 | 552 | login_check_credentials(); |
| 553 | 553 | if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; } |
| 554 | 554 | zPageName = P("name"); |
| 555 | 555 | if( zPageName==0 ){ |
| @@ -583,11 +583,11 @@ | ||
| 583 | 583 | zBody = pWiki->zWiki; |
| 584 | 584 | zMimetype = pWiki->zMimetype; |
| 585 | 585 | } |
| 586 | 586 | } |
| 587 | 587 | zMimetype = wiki_filter_mimetypes(zMimetype); |
| 588 | - if( !g.isHome && !noSubmenu ){ | |
| 588 | + if( !noSubmenu ){ | |
| 589 | 589 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 590 | 590 | && wiki_special_permission(zPageName) |
| 591 | 591 | ){ |
| 592 | 592 | style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); |
| 593 | 593 | }else if( rid && g.perm.ApndWiki ){ |
| 594 | 594 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -545,11 +545,11 @@ | |
| 545 | Manifest *pWiki = 0; |
| 546 | const char *zPageName; |
| 547 | const char *zMimetype = 0; |
| 548 | int isPopup = P("popup")!=0; |
| 549 | char *zBody = mprintf("%s","<i>Empty Page</i>"); |
| 550 | int noSubmenu = P("nsm")!=0; |
| 551 | |
| 552 | login_check_credentials(); |
| 553 | if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; } |
| 554 | zPageName = P("name"); |
| 555 | if( zPageName==0 ){ |
| @@ -583,11 +583,11 @@ | |
| 583 | zBody = pWiki->zWiki; |
| 584 | zMimetype = pWiki->zMimetype; |
| 585 | } |
| 586 | } |
| 587 | zMimetype = wiki_filter_mimetypes(zMimetype); |
| 588 | if( !g.isHome && !noSubmenu ){ |
| 589 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 590 | && wiki_special_permission(zPageName) |
| 591 | ){ |
| 592 | style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); |
| 593 | }else if( rid && g.perm.ApndWiki ){ |
| 594 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -545,11 +545,11 @@ | |
| 545 | Manifest *pWiki = 0; |
| 546 | const char *zPageName; |
| 547 | const char *zMimetype = 0; |
| 548 | int isPopup = P("popup")!=0; |
| 549 | char *zBody = mprintf("%s","<i>Empty Page</i>"); |
| 550 | int noSubmenu = P("nsm")!=0 || g.isHome; |
| 551 | |
| 552 | login_check_credentials(); |
| 553 | if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; } |
| 554 | zPageName = P("name"); |
| 555 | if( zPageName==0 ){ |
| @@ -583,11 +583,11 @@ | |
| 583 | zBody = pWiki->zWiki; |
| 584 | zMimetype = pWiki->zMimetype; |
| 585 | } |
| 586 | } |
| 587 | zMimetype = wiki_filter_mimetypes(zMimetype); |
| 588 | if( !noSubmenu ){ |
| 589 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 590 | && wiki_special_permission(zPageName) |
| 591 | ){ |
| 592 | style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); |
| 593 | }else if( rid && g.perm.ApndWiki ){ |
| 594 |