mirror
/
fenom
mirror of https://github.com/fenom-template/fenom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #64 from evseevnn/patch-1 

Modifiers: Remove unnecessary check for the string and fix regexp
This commit is contained in:
Ivan Shalganov 2013-12-21 09:08:47 -08:00
parent 7b87a88d16 cd8e8a1bb4
commit df08e491a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fenom/Modifier.php
View File

@ -25,7 +25,7 @@ class Modifier
*/
public static function dateFormat($date, $format = "%b %e, %Y")
{
if (is_string($date) && !is_numeric($date)) {
if (!is_numeric($date)) {
$date = strtotime($date);
if (!$date) $date = time();
}
@ -39,7 +39,7 @@ class Modifier
*/
public static function date($date, $format = "Y m d")
{
if (is_string($date) && !is_numeric($date)) {
if (!is_numeric($date)) {
$date = strtotime($date);
if (!$date) $date = time();
}
@ -100,7 +100,7 @@ class Modifier
if (preg_match('#^(.{' . $length . '}).*?(.{' . $length . '})?$#usS', $string, $match)) {
if (count($match) == 3) {
if ($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]) . $etc . preg_replace('#^.*\s#usS', "", $match[2]);
return preg_replace('#\s.*$#usS', "", $match[1]) . $etc . preg_replace('#.*\s#usS', "", $match[2]);
} else {
return $match[1] . $etc . $match[2];
}