Stop using getAnchor() with static targets

Adjusted with search and replace:

    \{@?\$__wcf->getAnchor\(['"]([_a-zA-Z0-9-]+)['"]\)\}

to

    #$1

This method still is in use in various templates with dynamic names. This
locations has not yet been adjusted, because it needs to be checked whether it
may contains special characters that need to be escaped.

see #4580

diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index cc81e80d29af4c51b59f9babd1a7ff7d653a794f..155119365dfde14579a9873e02108bfaea2d2e8d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -94,10 +94,10 @@
        <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="pageTabMenuContainer">
                <nav class="tabMenu">
                        <ul>
-                               <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('contents')}">{lang}wcf.acp.box.contents{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('conditions')}">{lang}wcf.acp.box.conditions{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acl.access{/lang}</a></li>
+                               <li><a href="#general">{lang}wcf.global.form.data{/lang}</a></li>
+                               <li><a href="#contents">{lang}wcf.acp.box.contents{/lang}</a></li>
+                               <li><a href="#conditions">{lang}wcf.acp.box.conditions{/lang}</a></li>
+                               <li><a href="#acl">{lang}wcf.acl.access{/lang}</a></li>
 
                                {event name='tabMenuTabs'}
                        </ul>

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index c77755585d028dc0fb1a6e56ecada01e1e3471bd..c1f3cab110c57f052e1714bee11f49b176d52b42 100644 (file)
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -48,9 +48,9 @@
 <div class="section tabMenuContainer" data-active="{if ENABLE_WOLTLAB_NEWS}news{else}system{/if}" data-store="activeTabMenuItem">
        <nav class="tabMenu">
                <ul>
-                       {if ENABLE_WOLTLAB_NEWS}<li><a href="{@$__wcf->getAnchor('news')}">{lang}wcf.acp.index.news{/lang}</a></li>{/if}
-                       <li><a href="{@$__wcf->getAnchor('system')}">{lang}wcf.acp.index.system{/lang}</a></li>
-                       <li><a href="{@$__wcf->getAnchor('credits')}">{lang}wcf.acp.index.credits{/lang}</a></li>
+                       {if ENABLE_WOLTLAB_NEWS}<li><a href="#news">{lang}wcf.acp.index.news{/lang}</a></li>{/if}
+                       <li><a href="#system">{lang}wcf.acp.index.system{/lang}</a></li>
+                       <li><a href="#credits">{lang}wcf.acp.index.credits{/lang}</a></li>
                        
                        {event name='tabMenuTabs'}
                </ul>

diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index e7408446ec191a06d13f9919effb4ea71bbc6a6b..fa4671cbdc6ceb8ba1f3daacca937df8a15a5c50 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -39,8 +39,8 @@
        <div class="section tabMenuContainer">
                <nav class="tabMenu">
                        <ul>
-                               <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('connect')}">{lang}wcf.acp.label.group.category.connect{/lang}</a></li>
+                               <li><a href="#general">{lang}wcf.global.form.data{/lang}</a></li>
+                               <li><a href="#connect">{lang}wcf.acp.label.group.category.connect{/lang}</a></li>
                        </ul>
                </nav>
                

diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 33ff4bc405adf8ccff31870190c0e41d98b6ef85..170da1dc8fc95cbca15c4b13438cb1e926808284 100644 (file)
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -45,9 +45,9 @@
                <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="pageTabMenuContainer">
                        <nav class="tabMenu">
                                <ul>
-                                       <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
-                                       <li><a href="{@$__wcf->getAnchor('pages')}">{lang}wcf.acp.page.list{/lang}</a></li>
-                                       <li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acl.access{/lang}</a></li>
+                                       <li><a href="#general">{lang}wcf.global.form.data{/lang}</a></li>
+                                       <li><a href="#pages">{lang}wcf.acp.page.list{/lang}</a></li>
+                                       <li><a href="#acl">{lang}wcf.acl.access{/lang}</a></li>
                                        
                                        {event name='tabMenuTabs'}
                                </ul>

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 020657b811ef1fbbab677716b2961a7378f66826..f2d1e35990635ab6314e9453f2388baadc51e315 100644 (file)
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -27,9 +27,9 @@
 <div class="section tabMenuContainer">
        <nav class="tabMenu">
                <ul>
-                       <li><a href="{@$__wcf->getAnchor('information')}">{lang}wcf.acp.package.information.title{/lang}</a></li>
+                       <li><a href="#information">{lang}wcf.acp.package.information.title{/lang}</a></li>
                        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
-                               <li><a href="{@$__wcf->getAnchor('dependencies')}">{lang}wcf.acp.package.dependencies.title{/lang}</a></li>
+                               <li><a href="#dependencies">{lang}wcf.acp.package.dependencies.title{/lang}</a></li>
                        {/if}
                        
                        {event name='tabMenuTabs'}
@@ -93,10 +93,10 @@
                        <nav class="menu">
                                <ul>
                                        {if $package->getRequiredPackages()|count}
-                                               <li><a href="{@$__wcf->getAnchor('dependencies-required')}">{lang}wcf.acp.package.dependencies.required{/lang}</a></li>
+                                               <li><a href="#dependencies-required">{lang}wcf.acp.package.dependencies.required{/lang}</a></li>
                                        {/if}
                                        {if $package->getDependentPackages()|count}
-                                               <li><a href="{@$__wcf->getAnchor('dependencies-dependent')}">{lang}wcf.acp.package.dependencies.dependent{/lang}</a></li>
+                                               <li><a href="#dependencies-dependent">{lang}wcf.acp.package.dependencies.dependent{/lang}</a></li>
                                        {/if}
                                        
                                        {event name='dependenciesSubTabMenuTabs'}

diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index a5082225ede4946974609f20379a8394c83c0cac..739c0cdc3ff4d73b4ed6e6d12c85b7573fe32ea4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -106,12 +106,12 @@
        <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="pageTabMenuContainer">
                <nav class="tabMenu">
                        <ul>
-                               <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('contents')}">{lang}wcf.acp.page.contents{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('boxes')}">{lang}wcf.acp.box.list{/lang}</a></li>
+                               <li><a href="#general">{lang}wcf.global.form.data{/lang}</a></li>
+                               <li><a href="#contents">{lang}wcf.acp.page.contents{/lang}</a></li>
+                               <li><a href="#boxes">{lang}wcf.acp.box.list{/lang}</a></li>
 
                                {if $action != 'edit' || $page->pageType != 'system'}
-                                       <li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acl.access{/lang}</a></li>
+                                       <li><a href="#acl">{lang}wcf.acl.access{/lang}</a></li>
                                {/if}
 
                                {event name='tabMenuTabs'}

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 8e47a95932de1825988da72824d15e5dea8ee2ee..2e238137afa747bc90fc71e0e414b2dd30ed53b1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -78,10 +78,10 @@
        <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="styleTabMenuContainer">
                <nav class="tabMenu">
                        <ul>
-                               <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.acp.style.general{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('globals')}">{lang}wcf.acp.style.globals{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('colors')}">{lang}wcf.acp.style.colors{/lang}</a></li>
-                               <li><a href="{@$__wcf->getAnchor('advanced')}">{lang}wcf.acp.style.advanced{/lang}</a></li>
+                               <li><a href="#general">{lang}wcf.acp.style.general{/lang}</a></li>
+                               <li><a href="#globals">{lang}wcf.acp.style.globals{/lang}</a></li>
+                               <li><a href="#colors">{lang}wcf.acp.style.colors{/lang}</a></li>
+                               <li><a href="#advanced">{lang}wcf.acp.style.advanced{/lang}</a></li>
                                
                                {event name='tabMenuTabs'}
                        </ul>
@@ -1015,8 +1015,8 @@
                        {if !$isTainted}
                                <nav class="menu">
                                        <ul>
-                                               <li data-name="advanced-custom"><a href="{@$__wcf->getAnchor('advanced-custom')}">{lang}wcf.acp.style.advanced.custom{/lang}</a></li>
-                                               <li data-name="advanced-original"><a href="{@$__wcf->getAnchor('advanced-original')}">{lang}wcf.acp.style.advanced.original{/lang}</a></li>
+                                               <li data-name="advanced-custom"><a href="#advanced-custom">{lang}wcf.acp.style.advanced.custom{/lang}</a></li>
+                                               <li data-name="advanced-original"><a href="#advanced-original">{lang}wcf.acp.style.advanced.original{/lang}</a></li>
                                        </ul>
                                </nav>
                                

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index c424f74c0f855519d5550e8908a106eb0e1cf739..08aea09e5c3f5410a9a4b3e68522faf4f53e5174 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -178,19 +178,19 @@
        <div class="section tabMenuContainer">
                <nav class="tabMenu">
                        <ul>
-                               <li><a href="{@$__wcf->getAnchor('__essentials')}">{lang}wcf.global.form.data{/lang}</a></li>
+                               <li><a href="#__essentials">{lang}wcf.global.form.data{/lang}</a></li>
 
                                {foreach from=$optionTree item=categoryLevel1}
                                        <li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
                                {/foreach}
 
                                {if MODULE_USER_SIGNATURE}
-                                       <li><a href="{@$__wcf->getAnchor('signatureManagement')}">{lang}wcf.user.signature{/lang}</a></li>
+                                       <li><a href="#signatureManagement">{lang}wcf.user.signature{/lang}</a></li>
                                {/if}
 
                                {if $action === 'edit'}
-                                       <li><a href="{@$__wcf->getAnchor('avatarForm')}">{lang}wcf.user.avatar{/lang}</a></li>
-                                       <li><a href="{@$__wcf->getAnchor('coverPhotoForm')}">{lang}wcf.user.coverPhoto{/lang}</a></li>
+                                       <li><a href="#avatarForm">{lang}wcf.user.avatar{/lang}</a></li>
+                                       <li><a href="#coverPhotoForm">{lang}wcf.user.coverPhoto{/lang}</a></li>
                                {/if}
 
                                {event name='tabMenuTabs'}