From 0ba6b7c9114748c25a9e3d35c8051be2e8e9720b Mon Sep 17 00:00:00 2001
From: Len Kranendonk <len@webgui-svn>
Date: Mon, 9 Aug 2004 08:36:09 +0000
Subject: [PATCH] Bugfix: [ 996592 ] Fixed Infinite loop in Page.pm makeUnique
 in 6.1.1

---
 docs/changelog/6.x.x.txt | 2 ++
 lib/WebGUI/Page.pm       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index e6e77807b..7a3bb25b7 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -30,6 +30,8 @@
  - Bugfix: [ 1000299 ] laodAllConfigs should be loadAllConfigs?
  - Bugfix: [ 995088 ] Error in printable macro 6.1.1
  - Bugfix: [ 1003511 ] Users cannot be added to Registered Users if removed
+ - Bugfix: [ 996592 ] Fixed Infinite loop in Page.pm makeUnique in 6.1.1
+
 
 6.1.1
  - bugfix [ 991313 ] Manage Translations doesn't work
diff --git a/lib/WebGUI/Page.pm b/lib/WebGUI/Page.pm
index e5e138978..ab93abeac 100644
--- a/lib/WebGUI/Page.pm
+++ b/lib/WebGUI/Page.pm
@@ -971,11 +971,11 @@ The page id of the page you're creating a URL for.
 sub makeUnique {
         my $url = $_[0] || "_1";
         my $pageId = $_[1] || "new";
-	my $where = "where urlizedTitle=".quote($url);
+	my $where; 
 	unless ($pageId eq "new") {
 		$where .= " and pageId<>".$pageId;
 	}
-        while (my ($test) = WebGUI::SQL->quickArray("select urlizedTitle from page ".$where)) {
+        while (my ($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle=".quote($url).$where)) {
                 if ($url =~ /(.*)(\d+$)/) {
                         $url = $1.($2+1);
                 } elsif ($test ne "") {