Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quick Fix Summary issues #1554

Merged
merged 4 commits into from
Aug 22, 2017
Merged

Quick Fix Summary issues #1554

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
125316a
Quick Fix Summary issues
ash0080 Jul 4, 2017
b86141a
fix: Add an option to compatibel with old version
ash0080 Jul 14, 2017
ac9a7d4
fit PS2R coding style
ash0080 Aug 11, 2017
2c53305
psr-2 reformated without assignment align
ash0080 Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions system/src/Grav/Common/Page/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,14 @@ public function summary($size = null)

// Set up variables to process summary from page or from custom summary
if ($this->summary === null) {
$content = $this->content();
$content = strip_tags($this->content());
$summary_size = $this->summary_size;
} else {
$content = $this->summary;
$summary_size = mb_strlen($this->summary);
$content = strip_tags($this->summary);
// Use mb_strwidth to deal with the 2 character widths characters
// Size should not include the html tags
// Or like <p>, <blockquote> will make the rendered width totally different
$summary_size = mb_strwidth($content ,'utf-8');
}

// Return calculated summary based on summary divider's position
Expand All @@ -510,7 +513,12 @@ public function summary($size = null)
if (!in_array($format, ['short', 'long'])) {
return $content;
} elseif (($format === 'short') && isset($summary_size)) {
return mb_substr($content, 0, $summary_size);
// Use mb_strimwidth to slice the string
if(mb_strwidth($content, 'utf8')>$summary_size){
return mb_strimwidth($content, 0, $summary_size);
} else {
return $content;
}
}

// Get summary size from site config's file
Expand All @@ -526,8 +534,15 @@ public function summary($size = null)
$size = 300;
}

$summary = Utils::truncateHTML($content, $size);

if (mb_strwidth($content,'utf-8') <= $size) {
return $content;
} else {
// Only return string but not html, wrap whatever html tag you want when using
return mb_strimwidth($content, 0, $size, '...', 'utf-8');
// return Truncator::truncateLetters($text, $length, $ellipsis);
}

return html_entity_decode($summary);
}

Expand Down