From 428d836d4e5d462aa4f1429a44557b65535f7218 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 27 Feb 2012 19:34:57 -0500 Subject: [PATCH] CC-3350: Upgrade 1.8.2 to 2.0.1 doesnt preserve recorded files names when the Airtime stor directory is a symlink -fixed? --- .../upgrades/airtime-1.9.0/airtime-upgrade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php index eeca6f9f8..ce4beb954 100644 --- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -617,7 +617,18 @@ class Airtime190Upgrade{ echo "Save DbMd to File".PHP_EOL; - $stor_dir = realpath($values['general']['base_files_dir']."/stor"); + + /* Do not use realpath. It expands a symlinked path into its real path + * which then causes us problems for string comparisons later on. */ + //$stor_dir = realpath($values['general']['base_files_dir']."/stor"); + + $baseDir = $values['general']['base_files_dir']; + if ($baseDir[strlen($baseDir)-1] != '/'){ + $baseDir.='/'; + } + + $stor_dir = $baseDir.'stor'; + $files = CcFilesQuery::create() ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)