From d558d101c514beeb8c91f65ae61d106b201dc472 Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Tue, 17 Aug 2021 00:48:04 +0200
Subject: Redo Merge branch 'hotfix/5.21' Standardized file headers

Try to do it right this time...

# Conflicts:
#	adodb-memcache.lib.inc.php

Fixes #751
---
 adodb-error.inc.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'adodb-error.inc.php')

diff --git a/adodb-error.inc.php b/adodb-error.inc.php
index 9751484f..517cf9b0 100644
--- a/adodb-error.inc.php
+++ b/adodb-error.inc.php
@@ -1,19 +1,27 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Error handling code and constants.
  *
- * Set tabs to 4 for best viewing.
+ * Adapted from the PEAR DB error handling code.
+ * Portions (c)1997-2002 The PHP Group
  *
- * The following code is adapted from the PEAR DB error handling code.
- * Portions (c)1997-2002 The PHP Group.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-
 if (!defined("DB_ERROR")) define("DB_ERROR",-1);
 
 if (!defined("DB_ERROR_SYNTAX")) {
-- 
cgit v1.3