diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c2c129526..f15525c00 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,4 +32,4 @@ jobs:
context: .
file: ./docker/Dockerfile-php8
push: true
- tags: ${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:v1.9.6-dev-php8
+ tags: ${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:v1.9.7-dev-php8
diff --git a/UPGRADING.html b/UPGRADING.html
index ee70e3904..07038b811 100644
--- a/UPGRADING.html
+++ b/UPGRADING.html
@@ -11,7 +11,7 @@
WebCalendar Upgrading Notes
WebCalendar Version: |
- 1.9.6 |
+ 1.9.7 |
diff --git a/composer.json b/composer.json
index bd72fc613..22eca0c2d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "k5n/webcalendar",
"type": "project",
"description": "Multi-user web-based calendar app",
- "version": "1.9.6",
+ "version": "1.9.7",
"homepage": "https://www.k5n.us/webcalendar/",
"authors": [
{
diff --git a/day.php b/day.php
index c47c49c4e..da7f0316f 100644
--- a/day.php
+++ b/day.php
@@ -10,7 +10,8 @@
load_user_categories();
-$wday = strftime ( '%w', mktime ( 0, 0, 0, $thismonth, $thisday, $thisyear ) );
+$thisdate = new DateTime("$thisyear-$thismonth-$thisday");
+$wday = $thisdate->format('w');
$now = mktime ( 23, 59, 59, $thismonth, $thisday, $thisyear );
$nowYmd = date ( 'Ymd', $now );
diff --git a/includes/config.php b/includes/config.php
index 9d91dccfa..d6c93cb81 100644
--- a/includes/config.php
+++ b/includes/config.php
@@ -161,9 +161,9 @@ function do_config()
];
// When changing PROGRAM VERSION, also change it in install/default_config.php
- $PROGRAM_VERSION = 'v1.9.6';
+ $PROGRAM_VERSION = 'v1.9.7';
// Update PROGRAM_DATE with official release data
- $PROGRAM_DATE = '30 Aug 2023';
+ $PROGRAM_DATE = '07 Sep 2023';
$PROGRAM_NAME = 'WebCalendar ' . "$PROGRAM_VERSION ($PROGRAM_DATE)";
$PROGRAM_URL = 'http://k5n.us/wp/webcalendar/';
diff --git a/includes/functions.php b/includes/functions.php
index 5efbf8649..d9afc4fa3 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -987,8 +987,9 @@ function display_activity_log( $cal_type, $cal_text = '', $break = '
'
else
$ret = '???';
//fix any broken special characters
- $cal_text = preg_replace( "/&(#[0-9]+|[a-z]+);/i", "&$1;",
- htmlentities( $cal_text ) );
+ if (!empty($cal_text)) {
+ $cal_text = preg_replace("/&(#[0-9]+|[a-z]+);/i", "&$1;", htmlentities($cal_text));
+ }
return $ret
. ( empty ( $cal_text ) ? '' : $break . $cal_text );
}
diff --git a/install/default_config.php b/install/default_config.php
index 8a8ad469c..9d8d42709 100644
--- a/install/default_config.php
+++ b/install/default_config.php
@@ -151,7 +151,7 @@
'USER_RSS_ENABLED' => 'N',
'USER_SEES_ONLY_HIS_GROUPS' => 'Y',
'USER_SORT_ORDER' => 'cal_lastname, cal_firstname',
- 'WEBCAL_PROGRAM_VERSION' => 'v1.9.6',
+ 'WEBCAL_PROGRAM_VERSION' => 'v1.9.7',
'WEEK_START' => '0',
'WEEKEND_START' => '6',
'WEEKENDBG' => '#d0d0d0',
diff --git a/install/index.php b/install/index.php
index 7b64dc2cf..7485ec3c5 100644
--- a/install/index.php
+++ b/install/index.php
@@ -193,7 +193,6 @@
. '\' ); document.go(-1)">';
// Invalid password.
echo '
' . translate( 'Password Incorrect' ) . '' . translate( 'Password Incorrect' );
- echo "Password: '$pwd'
md5 = " . md5($pwd) . "
envpwd = " . $envpwd;
echo '