Changeset:
9636655a05bb
https://sourceforge.net/p/mrbs/hg-code/ci/9636655a05bb79ea210cb1c31b89aee28e44a8dd
Author:
Campbell Morrison <[email protected]>
Date:
Thu Oct 06 17:39:22 2016 +0100
Log message:
Fixed duplicate function declaration
diffstat:
web/functions.inc | 14 ++++++++++++++
web/upgrade/24/post.inc | 12 ------------
web/upgrade/47/post.inc | 13 +------------
3 files changed, 15 insertions(+), 24 deletions(-)
diffs (69 lines):
diff -r d5993c2aa1c4 -r 9636655a05bb web/functions.inc
--- a/web/functions.inc Thu Oct 06 17:26:00 2016 +0100
+++ b/web/functions.inc Thu Oct 06 17:39:22 2016 +0100
@@ -7,6 +7,20 @@
require_once "mrbs_sql.inc";
+function get_microtime()
+{
+ if (function_exists('microtime'))
+ {
+ list($usec, $sec) = explode(" ", microtime());
+ return ((float)$usec + (float)$sec);
+ }
+ else
+ {
+ return time();
+ }
+}
+
+
function function_disabled($name)
{
$disabled = explode(', ', ini_get('disable_functions'));
diff -r d5993c2aa1c4 -r 9636655a05bb web/upgrade/24/post.inc
--- a/web/upgrade/24/post.inc Thu Oct 06 17:26:00 2016 +0100
+++ b/web/upgrade/24/post.inc Thu Oct 06 17:39:22 2016 +0100
@@ -13,18 +13,6 @@
// have the date. So I've taken the view here that it's not worth bothering
about
// as this upgrade procedure is only used once for existing entries).
-function get_microtime()
-{
- if (function_exists('microtime'))
- {
- list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
- }
- else
- {
- return time();
- }
-}
function do_sql_command($sql)
{
diff -r d5993c2aa1c4 -r 9636655a05bb web/upgrade/47/post.inc
--- a/web/upgrade/47/post.inc Thu Oct 06 17:26:00 2016 +0100
+++ b/web/upgrade/47/post.inc Thu Oct 06 17:39:22 2016 +0100
@@ -17,18 +17,7 @@
// have the date. So I've taken the view here that it's not worth bothering
about
// as this upgrade procedure is only used once for existing entries).
-function get_microtime()
-{
- if (function_exists('microtime'))
- {
- list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
- }
- else
- {
- return time();
- }
-}
+
function do_sql_command($sql)
{
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
