mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 16:26:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/adrianbj/processwire into adrianbj-dev

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-13 10:23:51 -04:00
parent 36c7b268e1 504d8b8645
commit 596acaa44b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wire/core/WireLog.php
View File

@@ -302,17 +302,17 @@ class WireLog extends Wire {
if(count($parts) == 2) { if(count($parts) == 2) {
$entry = array( $entry = array(
'date' => $parts[0], 'date' => $parts[0],
'user' => '', 'user' => $usr = $this->wire('sanitizer')->pageNameUTF8($parts[1]) === $parts[1] ? $parts[1] : '',
'url' => '', 'url' => $url = strpos($parts[1], '://') !== false ? $parts[1] : '',
'text' => $parts[1] 'text' => $url === '' && $usr === '' && strpos($parts[1], '://') === false ? $parts[1] : ''
); );
} else if(count($parts) == 3) { } else if(count($parts) == 3) {
$entry = array( $entry = array(
'date' => $parts[0], 'date' => $parts[0],
'user' => strpos($parts[1], '/') === false ? $parts[1] : '', 'user' => $usr = $this->wire('sanitizer')->pageNameUTF8($parts[1]) === $parts[1] ? $parts[1] : '',
'url' => strpos($parts[1], '/') !== false ? $parts[1] : '', 'url' => $url = (strpos($parts[2], '://') !== false ? $parts[2] : (strpos($parts[1], '://') !== false ? $parts[1] : '')),
'text' => $parts[2] 'text' => $url === '' || $usr === '' ? $parts[2] : ''
); );
} else { } else {
$entry = array( $entry = array(