opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'emptydirdefault' 

* emptydirdefault:
  fall back to empty (root) dir for base dir detection
This commit is contained in:
Andreas Gohr 2024-01-17 19:21:48 +01:00
parent 8985cadc85 ac56bec8fe
commit 77d32594e8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_test/tests/inc/parser/renderer_xhtml.test.php
View File

@ -269,7 +269,7 @@ class renderer_xhtml_test extends DokuWikiTest {
$this->assertSame('0', $header);
$this->R->internallink($id);
$expected = '<a href="/./doku.php?id='.$id.'" class="wikilink1" title="'.$id.'" data-wiki-id="blanktest">0</a>';
$expected = '<a href="/doku.php?id='.$id.'" class="wikilink1" title="'.$id.'" data-wiki-id="blanktest">0</a>';
$this->assertEquals($expected, trim($this->R->doc));
}
}

4
_test/tests/inc/styleutils_cssstyleini.test.php
View File

@ -10,8 +10,8 @@ class styleutils_cssstyleini_test extends DokuWikiTest {
array (
'screen' =>
array (
DOKU_CONF . 'tpl/dokuwiki/css/_tests.less' => '/./',
DOKU_INC . 'lib/tpl/dokuwiki/css/content.less' => '/./lib/tpl/dokuwiki/',
DOKU_CONF . 'tpl/dokuwiki/css/_tests.less' => '/',
DOKU_INC . 'lib/tpl/dokuwiki/css/content.less' => '/lib/tpl/dokuwiki/',
),
),
'replacements' =>

2
inc/init.php
View File

@ -475,7 +475,7 @@ function getBaseURL($abs = null)
);
$dir = dirname('/' . $dir);
} else {
$dir = '.'; //probably wrong
$dir = ''; //probably wrong, but we assume it's in the root
}
$dir = str_replace('\\', '/', $dir); // bugfix for weird WIN behaviour