diff --git a/action/save.php b/action/save.php index 2a593fa3..966fc895 100644 --- a/action/save.php +++ b/action/save.php @@ -200,12 +200,6 @@ function($matches){ } if(preg_match('/[\w\.]+\s*>/',$matches[0])) { return $matches[0]; - $this->write_debug($type,$display_url,$rest); // exclude dokuwiki's wiki links but first remove url display text if needed - list($type,$display_url,$rest) = explode('|', $matches[0]); - if(!isset($display_url)) { - return $matches[0]; - } - return $type . '|]]'; } if(preg_match('/([\w\.\-]+@[\w\.\-]+\.\w{2,3})\?.*?\|\1/i',$matches[0])) { return $matches[0]; diff --git a/ckeditor/lang/en.js b/ckeditor/lang/en.js index 2dfa52cf..0eb1b44b 100644 --- a/ckeditor/lang/en.js +++ b/ckeditor/lang/en.js @@ -53,12 +53,13 @@ MediaFileLink: "link to media file", InterWikiLink: "Interwiki Link", InterWikiType: "Interwiki Type", InterwikiPlaceHolder: "Interwiki Replacement Text", -InterwikiInfo: "
Dokuwiki\'s " + +InterwikiInfo: "
Dokuwiki\'s " + "interwiki links are short-cuts which look like this: [[wp>Shakespeare]], which will create a link to the English Wikipedia article on Shakespeare. " + "The wp part designates a link pattern; " + "the text following the '>' will be inserted into the link, replacing a place holder, which is enclosed in curly brackets, " + "as in {NAME}. When there is no place holder, the replacement text will be appended to the end of the link.
", MediaFileLink: "link to media file", +LinkDispText: "Link Display Text (optional)", SMBLabel: "Samba Share", GetHeadingsLabel: 'Get Headings' , QStringLabel: 'Query String (For example: value_1=1&value_2=2) ',