From bedd6f79a37aa0152f9406244e8963cd363b908c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 9 Oct 2020 17:36:55 +0000
Subject: [PATCH] 3.9.2-debian-10-r26 release

---
 bitnami/moodle/3/debian-10/Dockerfile         |  4 +--
 .../rootfs/opt/bitnami/scripts/libphp.sh      | 34 +++++++++++++++++++
 bitnami/moodle/README.md                      |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile
index 9cee80bc9b95..6e4a55ab412e 100644
--- a/bitnami/moodle/3/debian-10/Dockerfile
+++ b/bitnami/moodle/3/debian-10/Dockerfile
@@ -31,8 +31,8 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/moodle/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
@@ -41,7 +41,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="moodle" \
-    BITNAMI_IMAGE_VERSION="3.9.2-debian-10-r25" \
+    BITNAMI_IMAGE_VERSION="3.9.2-debian-10-r26" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     MARIADB_HOST="mariadb" \
diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
index 214308e26d81..ccff27faa835 100644
--- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
+++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libphp.sh
@@ -118,6 +118,40 @@ php_execute() {
     debug_execute php_execute_print_output "$@"
 }
 
+########################
+# Execute/run PHP code and print to stdout
+# Globals:
+#   None
+# Stdin:
+#   Code to execute
+# Arguments:
+#   $1..$n - Input arguments to script
+# Returns:
+#   None
+#########################
+php_execute_print_output() {
+    local php_cmd
+    # Obtain the command specified via stdin
+    php_cmd="$(</dev/stdin)"
+    debug "Executing PHP code:\n${php_cmd}"
+    php -- "$@" <<< "<?php ${php_cmd}"
+}
+
+########################
+# Execute/run PHP code
+# Globals:
+#   None
+# Stdin:
+#   Code to execute
+# Arguments:
+#   $1..$n - Input arguments to script
+# Returns:
+#   None
+#########################
+php_execute() {
+    debug_execute php_execute_print_output "$@"
+}
+
 ########################
 # Stop PHP-FPM
 # Globals:
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index a31c2713fe65..4aed51e82510 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3`, `3-debian-10`, `3.9.2`, `3.9.2-debian-10-r25`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.9.2-debian-10-r25/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.9.2`, `3.9.2-debian-10-r26`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.9.2-debian-10-r26/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).