renamed justlink option to linkonly

darcs-hash:20080223101426-7ad00-ceacdc83e829f1da7aa272eb597277a8c78113be.gz

2 files changed, 4 insertions, 4 deletions

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 4d3dc5380..c016171b0 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -686,8 +686,8 @@ function Doku_Handler_Parse_Media($match) {
         $linking = 'nolink';
     }else if(preg_match('/direct/i',$param)){
         $linking = 'direct';
-    }else if(preg_match('/justlink/i',$param)){
-        $linking = 'justlink';
+    }else if(preg_match('/linkonly/i',$param)){
+        $linking = 'linkonly';
     }else{
         $linking = 'details';
     }
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 774fbd5a2..5f25d167a 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -669,7 +669,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         resolve_mediaid(getNS($ID),$src, $exists);
 
         $noLink = false;
-        $render = ($linking == 'justlink') ? false : true;
+        $render = ($linking == 'linkonly') ? false : true;
         $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
 
         list($ext,$mime) = mimetype($src);
@@ -696,7 +696,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     function externalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
                             $height=NULL, $cache=NULL, $linking=NULL) {
         $noLink = false;
-        $render = ($linking == 'justlink') ? false : true;
+        $render = ($linking == 'linkonly') ? false : true;
         $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
 
         $link['url']    = ml($src,array('cache'=>$cache));