1 files changed, 18 insertions, 20 deletions
diff --git a/inc/template.php b/inc/template.php
index bd5f58792..7b0ef466b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -60,22 +60,19 @@ function tpl_content_core(){
         case 'show':
             html_show();
             break;
-        case 'preview':
-            html_edit($TEXT);
-            html_show($TEXT);
-            break;
+        case 'locked':
+            html_locked();
+        case 'edit':
         case 'recover':
-            html_edit($TEXT);
+            html_edit();
             break;
-        case 'edit':
+        case 'preview':
             html_edit();
+            html_show($TEXT);
             break;
         case 'draft':
             html_draft();
             break;
-        case 'wordblock':
-            html_edit($TEXT,'wordblock');
-            break;
         case 'search':
             html_search();
             break;
@@ -104,10 +101,6 @@ function tpl_content_core(){
             html_conflict(con($PRE,$TEXT,$SUF),$SUM);
             html_diff(con($PRE,$TEXT,$SUF),false);
             break;
-        case 'locked':
-            html_locked();
-            html_edit();
-            break;
         case 'login':
             html_login();
             break;
@@ -628,7 +621,7 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
                                 'class="action source" accesskey="v" rel="nofollow"',1);
                 }
             }else{
-                $out .= tpl_link(wl($ID,'do=show'),
+                $out .= tpl_link(wl($ID,''),
                         $pre.(($inner)?$inner:$lang['btn_show']).$suf,
                         'class="action show" accesskey="v" rel="nofollow"',1);
             }
@@ -657,7 +650,7 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
             break;
         case 'back':
             if ($parent = tpl_getparent($ID)) {
-                $out .= tpl_link(wl($parent,'do=show'),
+                $out .= tpl_link(wl($parent,''),
                         $pre.(($inner)?$inner:$lang['btn_back']).$suf,
                         'class="action back" accesskey="b" rel="nofollow"',1);
             }
@@ -1312,14 +1305,14 @@ function tpl_license($img='badge',$imgonly=false,$return=false){
         $src = license_img($img);
         if($src){
             $out .= '<a href="'.$lic['url'].'" rel="license"';
-            if($conf['target']['external']) $out .= ' target="'.$conf['target']['external'].'"';
+            if($conf['target']['extern']) $out .= ' target="'.$conf['target']['extern'].'"';
             $out .= '><img src="'.DOKU_BASE.$src.'" class="medialeft lic'.$img.'" alt="'.$lic['name'].'" /></a> ';
         }
     }
     if(!$imgonly) {
         $out .= $lang['license'];
         $out .= '<a href="'.$lic['url'].'" rel="license" class="urlextern"';
-        if(isset($conf['target']['external'])) $out .= ' target="'.$conf['target']['external'].'"';
+        if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"';
         $out .= '>'.$lic['name'].'</a>';
     }
     $out .= '</div>';
@@ -1373,9 +1366,14 @@ function tpl_subscribe() {
             if(!$sstl) $sstl = hsc($sub['style']);
             echo ' ('.$sstl.') ';
 
-            echo '<a href="'.wl($ID,array('do'=>'subscribe','sub_target'=>$sub['target'],'sub_style'=>$sub['style'],'sub_action'=>'unsubscribe')).'" class="unsubscribe">'.$lang['subscr_m_unsubscribe'].'</a>';
-
-            echo '</div></li>';
+            echo '<a href="' . wl($ID,
+                                  array('do'=>'subscribe',
+                                        'sub_target'=>$sub['target'],
+                                        'sub_style'=>$sub['style'],
+                                        'sub_action'=>'unsubscribe',
+                                        'sectok' => getSecurityToken())) .
+                 '" class="unsubscribe">'.$lang['subscr_m_unsubscribe'] .
+                 '</a></div></li>';
         }
         echo '</ul>';
     }