From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 9 Aug 2011 08:22:14 +0000 (+0200)
Subject: Preserve short variable names between versions if possible
X-Git-Tag: v3.3.3~22
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=0ced6d33ceccc21824ba85072d93cf08701c97b3;p=adminer.git

Preserve short variable names between versions if possible
---

diff --git a/compile.php b/compile.php
index 1293ef3d..e6339ccd 100644
--- a/compile.php
+++ b/compile.php
@@ -115,8 +115,14 @@ function php_shrink($input) {
 	}
 	
 	arsort($short_variables);
+	$chars = implode(range('a', 'z')) . '_' . implode(range('A', 'Z'));
+	// preserve variable names between versions if possible
+	$short_variables2 = array_splice($short_variables, strlen($chars));
+	ksort($short_variables);
+	ksort($short_variables2);
+	$short_variables += $short_variables2;
 	foreach (array_keys($short_variables) as $number => $key) {
-		$short_variables[$key] = short_identifier($number, implode(range('a', 'z')) . '_' . implode(range('A', 'Z'))); // could use also numbers and \x7f-\xff
+		$short_variables[$key] = short_identifier($number, $chars); // could use also numbers and \x7f-\xff
 	}
 	
 	$set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}'));