From fbdac06a9d0be5abc5d259cb1b44dec63b88eecb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 8 Oct 2005 19:02:15 +0000 Subject: [PATCH] remove old code --- ChangeLog | 1 + sql.php | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 356417df8..5f3263a85 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2005-10-08 Marc Delisle * libraries/session.inc.php: workaround for warnings on session_start() displayed on sf.net server + * sql.php: remove old code 2005-10-08 Michal Čihař * libraries/display_export.lib.php: Use same formatting for all options. diff --git a/sql.php b/sql.php index ade11d530..4078cc740 100644 --- a/sql.php +++ b/sql.php @@ -331,22 +331,10 @@ else { && !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+$@i', $sql_query)) { $sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'] . " "; -// if (preg_match('@(.*)([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))$@i', $sql_query, $regs)) { -// $full_sql_query = $regs[1] . $sql_limit_to_append . $regs[2]; -// } else { -// $full_sql_query = $sql_query . $sql_limit_to_append; -// } - $full_sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; // FIXME: pretty printing of this modified query if (isset($display_query)) { -// if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) { -// $display_query = $regs[1] . $sql_limit_to_append . $regs[3]; -// } else { -// $display_query = $display_query . $sql_limit_to_append; -// } - // if the analysis of the original query revealed that we found // a section_after_limit, we now have to analyze $display_query // to display it correctly