[vcl] branch develop updated: VCL-1106 - make PHP code compatible with PHP 7

[jf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git


The following commit(s) were added to refs/heads/develop by this push:
     new e17dae7  VCL-1106 - make PHP code compatible with PHP 7
e17dae7 is described below

commit e17dae78cf51e62b765fa90989ea38201d3b3a5d
Author: Josh Thompson <jf...@ncsu.edu>
AuthorDate: Tue May 7 15:21:49 2019 -0400

    VCL-1106 - make PHP code compatible with PHP 7
    
    utils.php: modified doQuery: added $mysqli_link_vcl as argument when calling mysqli_errno
---
 web/.ht-inc/utils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/.ht-inc/utils.php b/web/.ht-inc/utils.php
index c13be06..d8f8d7a 100644
--- a/web/.ht-inc/utils.php
+++ b/web/.ht-inc/utils.php
@@ -1300,7 +1300,7 @@ function doQuery($query, $errcode=101, $db="vcl", $nolog=0) {
 			mysqli_query($mysqli_link_vcl, $q);
 		}
 		for($i = 0; ! ($qh = mysqli_query($mysqli_link_vcl, $query)) && $i < 3; $i++) {
-			if(mysqli_errno() == '1213') # DEADLOCK, sleep and retry
+			if(mysqli_errno($mysqli_link_vcl) == '1213') # DEADLOCK, sleep and retry
 				usleep(50);
 			else
 				abort($errcode, $query);