aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2021-07-19 16:57:40 +0200
committerThomas Lange <code@nerdmind.de>2021-07-19 16:57:40 +0200
commit489851d1e7b1d346ff316e7a6721de574322d7d6 (patch)
tree643c2e54a9e2286268493f68613d562decc0ae20 /core
parent24b01055b2afae222e4a12894feee6214598ece4 (diff)
downloadblog-489851d1e7b1d346ff316e7a6721de574322d7d6.tar.gz
blog-489851d1e7b1d346ff316e7a6721de574322d7d6.tar.xz
blog-489851d1e7b1d346ff316e7a6721de574322d7d6.zip
Replace option $ITEM.EMOTICONS with WRAP_EMOTICONS
This commit adds the configuration option "WRAP_EMOTICONS" to supersede the configuration options "(CATEGORY|PAGE|POST|USER).EMOTICONS". If the value of "WRAP_EMOTICONS" evaluates to TRUE, the emoticons found in the content of an item will be wrapped into a "<span>" element which gives the user a description of the emoticon in the "title" attribute.
Diffstat (limited to 'core')
-rw-r--r--core/application.php5
-rw-r--r--core/functions.php20
2 files changed, 2 insertions, 23 deletions
diff --git a/core/application.php b/core/application.php
index 7ddf6a0..f44bb27 100644
--- a/core/application.php
+++ b/core/application.php
@@ -63,6 +63,7 @@ foreach([
'PATHINFO.PROT' => $_SERVER['REQUEST_SCHEME'] ?? 'https',
'PATHINFO.HOST' => $_SERVER['HTTP_HOST'] ?? 'localhost',
'PATHINFO.BASE' => '',
+ 'WRAP_EMOTICONS' => TRUE,
'CATEGORY.DIRECTORY' => 'category',
'PAGE.DIRECTORY' => 'page',
'POST.DIRECTORY' => 'post',
@@ -71,10 +72,6 @@ foreach([
'PAGE.SLUG_URLS' => TRUE,
'POST.SLUG_URLS' => TRUE,
'USER.SLUG_URLS' => TRUE,
- 'CATEGORY.EMOTICONS' => TRUE,
- 'PAGE.EMOTICONS' => TRUE,
- 'POST.EMOTICONS' => TRUE,
- 'USER.EMOTICONS' => TRUE,
'CATEGORY.LIST_SIZE' => 10,
'PAGE.LIST_SIZE' => 10,
'POST.LIST_SIZE' => 10,
diff --git a/core/functions.php b/core/functions.php
index b622601..ff52e0c 100644
--- a/core/functions.php
+++ b/core/functions.php
@@ -188,30 +188,12 @@ function parseContentTags(string $text): string {
# Parse entity content
#===============================================================================
function parseEntityContent(EntityInterface $Entity): string {
- switch($class = get_class($Entity)) {
- case 'ORM\Entities\Category':
- $prefix = 'CATEGORY';
- break;
- case 'ORM\Entities\Page':
- $prefix = 'PAGE';
- break;
- case 'ORM\Entities\Post':
- $prefix = 'POST';
- break;
- case 'ORM\Entities\User':
- $prefix = 'USER';
- break;
- default:
- $error = 'Unknown config prefix for <code>%s</code> entities.';
- throw new Exception(sprintf($error, $class));
- }
-
$Parsedown = new Parsedown();
$Parsedown->setUrlsLinked(FALSE);
$text = parseContentTags($Entity->get('body'));
- if(Application::get("$prefix.EMOTICONS")) {
+ if(Application::get('WRAP_EMOTICONS')) {
$text = parseUnicodeEmoticons($text);
}