Index: trunk/admin/config/addtheme_templates.php
===================================================================
diff -u -r374 -r375
--- trunk/admin/config/addtheme_templates.php	(.../addtheme_templates.php)	(revision 374)
+++ trunk/admin/config/addtheme_templates.php	(.../addtheme_templates.php)	(revision 375)
@@ -12,6 +12,7 @@
 ##	   result in revocation of the license and support		##
 ##	 privileges along maximum prosecution allowed by law.	##
 ##############################################################
+
 if(!strlen($pathtoroot))
 {
   $path=dirname(realpath(__FILE__));
@@ -206,7 +207,9 @@
 
 $objListToolBar->AddToInitScript("fwLoadMenus();\n");
 
-$c->VerifyTemplates();
+$objListView = new clsListView($objListToolBar);
+$objListView->CurrentPageVar = "Page_Template";
+$objListView->PerPageVar = "Perpage_Template";
 
 $objThemeFiles =  new clsThemeFileList();
 
@@ -227,21 +230,29 @@
     $sql .= "AND ".$where." ";
 if(strlen($order))
     $sql .= "ORDER BY ".$order." ";
+    
+$limit = ' '.$objListView->GetLimitSQL();;
+$sql .= $limit;
 
+$c->VerifyTemplates($where,$order,$limit); // slow down process
+
 if(isset($_GET["lpn"]))
     $objSession->SetVariable("Page_Template",$_GET["lpn"]);
 
-$sql .= GetLimitSQL($objSession->GetVariable("Page_Template"),$objConfig->Get("Perpage_Template"));
 
+
+
+
 $objThemeFiles->Query_Item($sql);
+
 $ThemeDir = strtolower($c->Get("Name")).$pathchar;
 
 $itemcount = QueryCount($sql);
 
 if($objSession->HasSystemPermission("DEBUG.LIST"))
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
 
-$objListView = new clsListView($objListToolBar,$objThemeFiles);
+$objListView->SetListItems($objThemeFiles);
 $objListView->IdField = "FileId";
 
 $order = $objConfig->Get("Template_LV_Sortfield");
@@ -255,8 +266,7 @@
 $objListView->PrintToolBar = FALSE;
 $objListView->checkboxes = TRUE;
 
-$objListView->CurrentPageVar = "Page_Template";
-$objListView->PerPageVar = "Perpage_Template";
+
 $objListView->CheckboxName = "itemlist[]"; 
 $objListView->SearchBar = TRUE;
 $objListView->SearchKeywords = $SearchWords;