Skip to content

Commit

Permalink
Fixed error
Browse files Browse the repository at this point in the history
  • Loading branch information
No3x committed Jul 31, 2016
1 parent b01ede8 commit 8fb984b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions WPML_OptionsManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ public function getSetting($settingName, $default = null) {
public function getDateTimeFormatString() {
$date_format = get_option( 'date_format' );
$time_format = get_option( 'time_format' );
$date_format = empty( $date_format ) ? 'F j, Y' : get_option( 'date_format' );
$time_format = empty( get_option( 'time_format' ) ) ? 'g:i a' : $time_format;
$timeFormat = "Y-m-d H:i:s";
$date_format = empty( $date_format ) ? 'F j, Y' : $date_format;
$time_format = empty( $time_format ) ? 'g:i a' : $time_format;
if ( $this->getSetting( 'datetimeformat-use-wordpress', false) == true )
$timeFormat = $date_format . " " . $time_format;
return $timeFormat;
Expand Down

0 comments on commit 8fb984b

Please sign in to comment.