[fix] encode of date
This commit is contained in:
parent
8b2d826eb1
commit
72944a7234
2 changed files with 3 additions and 3 deletions
|
@ -54,7 +54,7 @@
|
||||||
require($GLOBALS['config']['DATADIR'].'/options.php');
|
require($GLOBALS['config']['DATADIR'].'/options.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
define('myShaarli_version','1.1.1');
|
define('myShaarli_version','1.1.2');
|
||||||
define('PHPPREFIX','<?php /* '); // Prefix to encapsulate data in php code.
|
define('PHPPREFIX','<?php /* '); // Prefix to encapsulate data in php code.
|
||||||
define('PHPSUFFIX',' */ ?>'); // Suffix to encapsulate data in php code.
|
define('PHPSUFFIX',' */ ?>'); // Suffix to encapsulate data in php code.
|
||||||
// http://server.com/x/shaarli --> /shaarli/
|
// http://server.com/x/shaarli --> /shaarli/
|
||||||
|
@ -592,7 +592,7 @@ function linkdate2locale($linkdate)
|
||||||
if(empty($GLOBALS['config']['DATE_FORMAT'])){
|
if(empty($GLOBALS['config']['DATE_FORMAT'])){
|
||||||
$GLOBALS['config']['DATE_FORMAT'] = '%c';
|
$GLOBALS['config']['DATE_FORMAT'] = '%c';
|
||||||
}
|
}
|
||||||
return utf8_encode(strftime($GLOBALS['config']['DATE_FORMAT'],linkdate2timestamp($linkdate))); // %c is for automatic date format according to locale.
|
return strftime($GLOBALS['config']['DATE_FORMAT'],linkdate2timestamp($linkdate)); // %c is for automatic date format according to locale.
|
||||||
// Note that if you use a local which is not installed on your webserver,
|
// Note that if you use a local which is not installed on your webserver,
|
||||||
// the date will not be displayed in the chosen locale, but probably in US notation.
|
// the date will not be displayed in the chosen locale, but probably in US notation.
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1.1.1
|
1.1.2
|
||||||
|
|
Loading…
Reference in a new issue