mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 18:24:57 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1254

Browse Source
This commit is contained in:
Ryan Cramer
2020-10-01 07:58:48 -04:00
parent 0953fdb347
commit 45ad9473d2
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
wire/core/WireTextTools.php
View File

@@ -464,6 +464,8 @@ class WireTextTools extends Wire {
*/ */
function truncate($str, $maxLength, $options = array()) { function truncate($str, $maxLength, $options = array()) {
if(!strlen($str)) return '';
$ent = __(true, 'entityEncode', false); $ent = __(true, 'entityEncode', false);
$defaults = array( $defaults = array(
@@ -484,8 +486,6 @@ class WireTextTools extends Wire {
if($ent) __(true, 'entityEncode', $ent); if($ent) __(true, 'entityEncode', $ent);
if(!strlen($str)) return '';
if(is_string($options) && ctype_alpha($options)) { if(is_string($options) && ctype_alpha($options)) {
$defaults['type'] = $options; $defaults['type'] = $options;
$options = array(); $options = array();
@@ -595,7 +595,7 @@ class WireTextTools extends Wire {
$pos = array_pop($tests); $pos = array_pop($tests);
$result = trim($this->substr($str, 0, $pos + 1)); $result = trim($this->substr($str, 0, $pos + 1));
$lastChar = $this->substr($result, -1); $lastChar = $this->substr($result, -1);
$result = rtrim($result, $options['trim']); $result = $this->rtrim($result, $options['trim']);
if($type === 'sentence' || $type === 'block') { if($type === 'sentence' || $type === 'block') {
// good to go with result as is // good to go with result as is
@@ -608,7 +608,7 @@ class WireTextTools extends Wire {
if(in_array($c, $endSentenceChars)) continue; if(in_array($c, $endSentenceChars)) continue;
$trims .= $c; $trims .= $c;
} }
$result = rtrim($result, $trims) . $options['more']; $result = $this->rtrim($result, $trims) . $options['more'];
} else { } else {
$result .= $options['more']; $result .= $options['more'];
} }
@@ -621,7 +621,7 @@ class WireTextTools extends Wire {
} }
} else { } else {
// if we didn't find any place to truncate, just return exact truncated string // if we didn't find any place to truncate, just return exact truncated string
$result = trim($str, $options['trim']) . $options['more']; $result = $this->trim($str, $options['trim']) . $options['more'];
} }
if(strlen($options['more'])) { if(strlen($options['more'])) {
@@ -1398,7 +1398,39 @@ class WireTextTools extends Wire {
*/ */
public function trim($str, $chars = '') { public function trim($str, $chars = '') {
if(!$this->mb) return $chars === '' ? trim($str) : trim($str, $chars); if(!$this->mb) return $chars === '' ? trim($str) : trim($str, $chars);
return $this->wire('sanitizer')->trim($str, $chars); return $this->wire()->sanitizer->trim($str, $chars);
}
/**
* Strip whitespace (or other characters) from the beginning of string only (aka left trim)
*
* #pw-group-PHP-function-alternates
*
* @param string $str
* @param string $chars Omit for default
* @return string
* @since 3.0.168
*
*/
public function ltrim($str, $chars = '') {
if(!$this->mb) return $chars === '' ? ltrim($str) : ltrim($str, $chars);
return $this->wire()->sanitizer->trim($str, $chars, 'ltrim');
}
/**
* Strip whitespace (or other characters) from the end of string only (aka right trim)
*
* #pw-group-PHP-function-alternates
*
* @param string $str
* @param string $chars Omit for default
* @return string
* @since 3.0.168
*
*/
public function rtrim($str, $chars = '') {
if(!$this->mb) return $chars === '' ? rtrim($str) : rtrim($str, $chars);
return $this->wire()->sanitizer->trim($str, $chars, 'rtrim');
} }