Skip to content

Commit 2528599

Browse files
committed
Fix warnings
1 parent 196b840 commit 2528599

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

parser/InternalLinkNode.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace dokuwiki\plugin\prosemirror\parser;
44

5+
use dokuwiki\File\PageResolver;
6+
57
class InternalLinkNode extends LinkNode
68
{
79
public function toSyntax()
@@ -43,10 +45,10 @@ public static function resolveLink($inner, $curId) {
4345
if (count($parts) === 2) {
4446
$params = $parts[1];
4547
}
46-
$ns = getNS($curId);
4748
$xhtml_renderer = p_get_renderer('xhtml');
4849
$default = $xhtml_renderer->_simpleTitle($parts[0]);
49-
resolve_pageid($ns, $resolvedPageId, $exists);
50+
$resolver = new PageResolver($curId);
51+
$resolvedPageId = $resolver->resolveId($resolvedPageId);
5052

5153
if (useHeading('content')) {
5254
$heading = p_get_first_heading($resolvedPageId);
@@ -59,7 +61,7 @@ public static function resolveLink($inner, $curId) {
5961

6062
return [
6163
'id' => $resolvedPageId,
62-
'exists' => $exists,
64+
'exists' => page_exists($resolvedPageId),
6365
'heading' => $heading,
6466
'url' => $url,
6567
];

parser/LinkNode.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace dokuwiki\plugin\prosemirror\parser;
44

5+
use dokuwiki\File\MediaResolver;
6+
57
abstract class LinkNode extends Node implements InlineNodeInterface
68
{
79

@@ -128,7 +130,11 @@ public static function resolveImageTitle($pageId, $imageId, $title = null, $alig
128130
$xhtml_renderer = p_get_renderer('xhtml');
129131
$src = $imageId;
130132
if (!media_isexternal($src)) {
131-
resolve_mediaid(getNS($pageId), $src, $exists);
133+
$resolver = new MediaResolver(getNS($pageId));
134+
$media = $resolver->resolveId($src);
135+
if (!media_exists($media)) {
136+
return '';
137+
}
132138
}
133139
return $xhtml_renderer->_media(
134140
$src,

script.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ function menubar() {
185185
threshold: [0, 1]
186186
}
187187
);
188-
observer.observe(editorswitch);
188+
if (editorswitch && menubar) {
189+
observer.observe(editorswitch);
190+
}
189191
}
190192

191193

0 commit comments

Comments
 (0)