Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1140 from ArthurHoaro/hotfix/markdown-rss-permalink

Browse source 
Fix feed permalink rendering with markdown escape set to true
This commit is contained in:
ArthurHoaro 2018-05-29 19:33:20 +02:00 committed by GitHub
commit cdebf7f9b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/markdown/markdown.php
View file

@ -6,6 +6,8 @@
* Shaare's descriptions are parsed with Markdown. * Shaare's descriptions are parsed with Markdown.
*/ */
use Shaarli\Config\ConfigManager;
/* /*
* If this tag is used on a shaare, the description won't be processed by Parsedown. * If this tag is used on a shaare, the description won't be processed by Parsedown.
*/ */
@ -50,6 +52,7 @@ function hook_markdown_render_feed($data, $conf)
$value = stripNoMarkdownTag($value); $value = stripNoMarkdownTag($value);
continue; continue;
} }
$value['description'] = reverse_feed_permalink($value['description']);
$value['description'] = process_markdown( $value['description'] = process_markdown(
$value['description'], $value['description'],
$conf->get('security.markdown_escape', true), $conf->get('security.markdown_escape', true),
@ -244,6 +247,11 @@ function reverse_space2nbsp($description)
return preg_replace('/(^| ) /m', '$1 ', $description); return preg_replace('/(^| ) /m', '$1 ', $description);
} }
function reverse_feed_permalink($description)
{
return preg_replace('@&#8212; <a href="([^"]+)" title="[^"]+">(\w+)</a>$@im', '&#8212; [$2]($1)', $description);
}
/** /**
* Replace not whitelisted protocols with http:// in given description. * Replace not whitelisted protocols with http:// in given description.
* *

55
tests/plugins/PluginMarkdownTest.php
View file

@ -49,6 +49,30 @@ public function testMarkdownLinklist()
$this->assertNotFalse(strpos($data['links'][0]['description'], '<p>')); $this->assertNotFalse(strpos($data['links'][0]['description'], '<p>'));
} }
/**
* Test render_feed hook.
*/
public function testMarkdownFeed()
{
$markdown = '# My title' . PHP_EOL . 'Very interesting content.';
$markdown .= '&#8212; <a href="http://domain.tld/?0oc_VQ" title="Permalien">Permalien</a>';
$data = array(
'links' => array(
0 => array(
'description' => $markdown,
),
),
);
$data = hook_markdown_render_feed($data, $this->conf);
$this->assertNotFalse(strpos($data['links'][0]['description'], '<h1>'));
$this->assertNotFalse(strpos($data['links'][0]['description'], '<p>'));
$this->assertStringEndsWith(
'&#8212; <a href="http://domain.tld/?0oc_VQ">Permalien</a></p></div>',
$data['links'][0]['description']
);
}
/** /**
* Test render_daily hook. * Test render_daily hook.
* Only check that there is basic markdown rendering. * Only check that there is basic markdown rendering.
@ -104,6 +128,37 @@ public function testReverseSpace2nbsp()
$this->assertEquals($text, $reversedText); $this->assertEquals($text, $reversedText);
} }
public function testReverseFeedPermalink()
{
$text = 'Description... ';
$text .= '&#8212; <a href="http://domain.tld/?0oc_VQ" title="Permalien">Permalien</a>';
$expected = 'Description... &#8212; [Permalien](http://domain.tld/?0oc_VQ)';
$processedText = reverse_feed_permalink($text);
$this->assertEquals($expected, $processedText);
}
public function testReverseLastFeedPermalink()
{
$text = 'Description... ';
$text .= '<br>&#8212; <a href="http://domain.tld/?0oc_VQ" title="Permalien">Permalien</a>';
$expected = $text;
$text .= '<br>&#8212; <a href="http://domain.tld/?0oc_VQ" title="Permalien">Permalien</a>';
$expected .= '<br>&#8212; [Permalien](http://domain.tld/?0oc_VQ)';
$processedText = reverse_feed_permalink($text);
$this->assertEquals($expected, $processedText);
}
public function testReverseNoFeedPermalink()
{
$text = 'Hello! Where are you from?';
$expected = $text;
$processedText = reverse_feed_permalink($text);
$this->assertEquals($expected, $processedText);
}
/** /**
* Test sanitize_html(). * Test sanitize_html().
*/ */