From 2d22c91b52426355d43f44644f029a9cd02aaf5a Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Fri, 27 Jun 2003 15:26:26 +0000 Subject: [PATCH] Well, it *did* read "remove when accepted", didn't it? ;-)) --- ChangeLog | 3 +++ left.php3 | 44 -------------------------------------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3665290d..7c14e193d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-27 Garvin Hicking + * left.php3: Removed debugging code + 2003-06-27 Michal Cihar * libraries/display_tbl.lib.php3, libraries/relation.lib.php3: Added some checks to avoid trying to use relations when no table (bug #761835). diff --git a/left.php3 b/left.php3 index ec576a70f..6b288531e 100755 --- a/left.php3 +++ b/left.php3 @@ -65,43 +65,7 @@ function PMA_indent($spaces) { return $string; } -/* DEBUGGING ONLY - REMOVE WHEN PATCH ACCEPTED -$path = ''; -$functioncalls = ''; - -function functioncalls($name, $args, $array) { - $GLOBALS['functioncalls'] .= $name . "\n------------------------\n"; - foreach($array AS $xkey => $key) { - $defvals = explode(':' , $key); - $key=$defvals[0]; - - $val = (isset($args[$xkey]) ? $args[$xkey] : $defvals[1]); - if (is_array($val)) { - $GLOBALS['functioncalls'] .= $key . "\n"; - foreach($val AS $skey => $sval) { - if (!is_array($val)) { - $GLOBALS['functioncalls'] .= "\t" . $skey . "\n\t\t" . stripslashes(var_export($sval)) . "\n"; - } else { - $GLOBALS['functioncalls'] .= "\t" . $skey . "\n\t\t[ARRAY]\n"; - } - } - } else { - $GLOBALS['functioncalls'] .= $key . "\n\t" . stripslashes(var_export($val, true)) . "\n"; - } - } - - $GLOBALS['functioncalls'] .= "\n\n"; - - return true; -} -*/ - function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_level, $val, $childout = true) { -/* DEBUGGING ONLY - REMOVE WHEN PATCH ACCEPTED - $args = func_get_args(); - functioncalls('PMA_nestedSetHeaderParent', $args, array('baseid', 'key','keyhistory','indent','indent_level','val','childout:true')); -*/ - $name = $key; $id = eregi_replace('[^a-z0-9]*', '', $baseid . $keyhistory . $key) . $indent; @@ -132,10 +96,6 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_ } function PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, $indent, $indent_level, $headerOut, $firstGroup = false, $firstGroupClose = true) { -/* DEBUGGING ONLY - REMOVE WHEN PATCH ACCEPTED - $args = func_get_args(); - functioncalls('PMA_nestedSetHeader', $args, array('baseid', 'tablestack','keyhistory','indent','indent_level','headerOut','firstGroup:false')); -*/ if ($firstGroup) { PMA_nestedSetHeaderParent($baseid, $firstGroup, $keyhistory, $indent, $indent_level, $tablestack); $indent++; @@ -167,10 +127,6 @@ function PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, $indent, $indent } function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory = '', $headerOut = false, $indent = 1) { -/* DEBUGGING ONLY - REMOVE WHEN PATCH ACCEPTED - $args = func_get_args(); - functioncalls('PMA_nestedSet', $args, array('baseid', 'tablestack', 'key:__protected__', 'keyhistory:\'\'', 'headerOut:false', 'indent:1')); -*/ if ($keyhistory == '' && $key != '__protected__') { $keyhistory = $key;