|
From: <var...@us...> - 2021-12-10 19:59:08
|
Revision: 10772
http://sourceforge.net/p/phpwiki/code/10772
Author: vargenau
Date: 2021-12-10 19:59:05 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Replace strftime by date when possible
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/lib/WikiTheme.php 2021-12-10 19:59:05 UTC (rev 10772)
@@ -1582,8 +1582,7 @@
function calendarLink($date = false)
{
- return $this->calendarBase() . '/' .
- strftime("%Y-%m-%d", $date ? $date : time());
+ return $this->calendarBase() . '/' . date("Y-m-d", $date ? $date : time());
}
function calendarBase()
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -67,7 +67,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Crao/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -28,7 +28,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -31,7 +31,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
?>
<li>
<?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -73,7 +73,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/default/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -29,7 +29,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?>
<?php echo $SEP?>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/head.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -66,7 +66,7 @@
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2021-12-10 10:02:15 UTC (rev 10771)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2021-12-10 19:59:05 UTC (rev 10772)
@@ -25,7 +25,7 @@
$UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . date("Y-m-d");
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
<?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|