# HG changeset patch
# User Ben Schmidt
# Date 1287356364 -39600
# Node ID dbb144f085a5432e9f3049f946ac6c277f02c621
# Parent  4bf5317e9bd7c25ff1d1e45328ed9abccc082149
Fix php-admin to work when topdir contains a symlink (e.g. on Mac)

diff -r 4bf5317e9bd7 -r dbb144f085a5 ChangeLog
--- a/ChangeLog	Mon Oct 18 09:56:38 2010 +1100
+++ b/ChangeLog	Mon Oct 18 09:59:24 2010 +1100
@@ -1,3 +1,4 @@
+ o Fix php-admin to work when topdir contains a symlink (e.g. on Mac)
  o Better techniques for locating support files in php-admin -- existing
    installations will need to have their conf/config.php altered to set
    the variable $confdir
diff -r 4bf5317e9bd7 -r dbb144f085a5 contrib/web/php-admin/htdocs/edit.php
--- a/contrib/web/php-admin/htdocs/edit.php	Mon Oct 18 09:56:38 2010 +1100
+++ b/contrib/web/php-admin/htdocs/edit.php	Mon Oct 18 09:59:24 2010 +1100
@@ -104,7 +104,7 @@
 if(!isset($list))
 die("no list specified");
 
-if (dirname(realpath($topdir."/".$list)) != $topdir)
+if (dirname(realpath($topdir."/".$list)) != realpath($topdir))
 die("list outside topdir");
 
 if(!is_dir($topdir."/".$list))
diff -r 4bf5317e9bd7 -r dbb144f085a5 contrib/web/php-admin/htdocs/save.php
--- a/contrib/web/php-admin/htdocs/save.php	Mon Oct 18 09:56:38 2010 +1100
+++ b/contrib/web/php-admin/htdocs/save.php	Mon Oct 18 09:59:24 2010 +1100
@@ -84,7 +84,7 @@
 if(!isset($list))
 die("no list specified");
 
-if (dirname(realpath($topdir."/".$list)) != $topdir)
+if (dirname(realpath($topdir."/".$list)) != realpath($topdir))
 die("list outside topdir");
 
 if(!is_dir($topdir."/".$list))