From 59de93ccdfcbc388db2a76f76991bd9ae7afa71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0koda?= <commits@skodak.org>
Date: Wed, 12 Mar 2014 10:46:04 +0800
Subject: [PATCH] MDL-44299 resolve collision with session_gc() in PHP 5.6

---
 lib/deprecatedlib.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index b58d1ee69bb..6301a5d4ff3 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -105,17 +105,21 @@ function session_kill_user($userid) {
     \core\session\manager::kill_user_sessions($userid);
 }
 
-/**
- * Session garbage collection
- * - verify timeout for all users
- * - kill sessions of all deleted users
- * - kill sessions of users with disabled plugins or 'nologin' plugin
- *
- * @deprecated since 2.6
- */
-function session_gc() {
-    debugging('session_gc() is deprecated, use \core\session\manager::gc() instead', DEBUG_DEVELOPER);
-    \core\session\manager::gc();
+// PHP 5.6 includes session_gc(), we cannot define it any more.
+if (!function_exists('session_gc')) {
+    /**
+     * Session garbage collection
+     * - verify timeout for all users
+     * - kill sessions of all deleted users
+     * - kill sessions of users with disabled plugins or 'nologin' plugin
+     *
+     * @deprecated since 2.6
+     */
+    function session_gc()
+    {
+        debugging('session_gc() is deprecated, use \core\session\manager::gc() instead', DEBUG_DEVELOPER);
+        \core\session\manager::gc();
+    }
 }
 
 /**