From 2e5027a1aab5820b0bf79068aead898f71a0ea45 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 11 Mar 2025 13:50:23 +0100
Subject: [PATCH] Compile: Fix shortening in private methods

---
 adminer/include/version.inc.php | 2 +-
 changes.txt                     | 3 +++
 compile.php                     | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index babfbe1c..1f3be8e7 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,4 +1,4 @@
 <?php
 namespace Adminer;
 
-$VERSION = "5.0.3";
+$VERSION = "5.0.4-dev";
diff --git a/changes.txt b/changes.txt
index ac70e51e..6f8b790d 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer dev:
+Compile: Fix shortening in private methods (regression from 5.0.3)
+
 Adminer 5.0.3 (released 2025-03-11):
 Fix gzip export (bug #896, regression from 5.0.0)
 Fix importing multiple SQL files not terminated by semicolon
diff --git a/compile.php b/compile.php
index 78055a77..cce07cbb 100755
--- a/compile.php
+++ b/compile.php
@@ -297,8 +297,8 @@ function php_shrink($input) {
 				$doc_comment = true;
 				$token[1] = substr_replace($token[1], "* @version $VERSION\n", -2, 0);
 			}
-			if ($token[0] == T_VAR || $token[0] == T_PUBLIC || $token[0] == T_PROTECTED || $token[0] == T_PRIVATE) {
-				if ($token[0] == T_PUBLIC && $tokens[$i+2][1][0] == '$') {
+			if ($token[0] == T_VAR || $token[0] == T_PUBLIC || $token[0] == T_PROTECTED || $token[0] == T_PRIVATE && $tokens[$i+2][1][0] == '$') {
+				if ($token[0] == T_PUBLIC) {
 					$token[1] = 'var';
 				}
 				$shortening = false;
@@ -446,7 +446,7 @@ if ($driver) {
 	}
 	if (count($drivers) == 1) {
 		$file = str_replace('html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);")', "\"<input type='hidden' name='auth[driver]' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers) . "\"", $file, $count);
-		if (!$count) {
+		if (!$count && $project != "editor") {
 			echo "auth[driver] form field not found\n";
 		}
 		$file = str_replace(" . script(\"qs('#username').form['auth[driver]'].onchange();\")", "", $file);