From 8acb31082c9a565d775be0739e6deaf1773f9751 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 23 Feb 2008 11:14:26 +0100
Subject: [PATCH] renamed justlink option to linkonly
darcs-hash:20080223101426-7ad00-ceacdc83e829f1da7aa272eb597277a8c78113be.gz
---
_test/cases/inc/parser/parser_links.test.php | 6 +++---
inc/parser/handler.php | 4 ++--
inc/parser/xhtml.php | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 86597ba9e..d255437f8 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -322,14 +322,14 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
$this->assertEqual(array_map('stripByteIndex',$this->H->calls),$calls);
}
- function testMediaInternalJustlink() {
+ function testMediaInternalLinkOnly() {
$this->P->addMode('media',new Doku_Parser_Mode_Media());
- $this->P->parse('Foo {{img.gif?justlink}} Bar');
+ $this->P->parse('Foo {{img.gif?linkonly}} Bar');
$calls = array (
array('document_start',array()),
array('p_open',array()),
array('cdata',array("\n".'Foo ')),
- array('internalmedia',array('img.gif',NULL,NULL,NULL,NULL,'cache','justlink')),
+ array('internalmedia',array('img.gif',NULL,NULL,NULL,NULL,'cache','linkonly')),
array('cdata',array(' Bar'."\n")),
array('p_close',array()),
array('document_end',array()),
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));
--
GitLab