Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/zblogcn/zblogphp
Browse files Browse the repository at this point in the history
  • Loading branch information
rainbowsoft committed Dec 20, 2024
2 parents 0e171d4 + 39fda9e commit 070db96
Show file tree
Hide file tree
Showing 2 changed files with 453 additions and 398 deletions.
2 changes: 1 addition & 1 deletion zb_system/function/lib/base/post.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function Time($s = 'Y-m-d H:i:s', $type = 'PostTime')
}
if (func_num_args() == 2 && !array_key_exists($type, $this->data) && array_key_exists($s, $this->data)) {
list($type, $s) = array($s, $type);
} elseif (func_num_args() == 1 && array_key_exists($s, $this->data)){
} elseif (func_num_args() == 1 && array_key_exists($s, $this->data)) {
list($type, $s) = array($s, 'Y-m-d H:i:s');
}
if (array_key_exists($type, $this->data)) {
Expand Down
Loading

0 comments on commit 070db96

Please sign in to comment.