Revert changes since Standardized file headers merge

The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.

Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:

- "Merge branch 'hotfix/5.21' Standardized file headers",
  e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
  5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
  af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
  a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
  20b01e83cb61b6b2460f64c7d1277c5f4cc28574.

Fixes #751

1 files changed, 23 insertions, 19 deletions

diff --git a/adodb-pager.inc.php b/adodb-pager.inc.php
index cfe981d3..3bea3307 100644
--- a/adodb-pager.inc.php
+++ b/adodb-pager.inc.php
@@ -1,24 +1,28 @@
 <?php
-/**
- * Recordset pagination with First/Prev/Next/Last links
- *
- * 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
- */
 
+/*
+	@version   v5.22.0-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.
+	  Set tabs to 4 for best viewing.
+
+  	This class provides recordset pagination with
+	First/Prev/Next/Last links.
+
+	Feel free to modify this class for your own use as
+	it is very basic. To learn how to use it, see the
+	example in adodb/tests/testpaging.php.
+
+	"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
+
+	Please note, this class is entirely unsupported,
+	and no free support requests except for bug reports
+	will be entertained by the author.
+
+*/
 class ADODB_Pager {
 	var $id; 	// unique id for pager (defaults to 'adodb')
 	var $db; 	// ADODB connection object