Index: trunk/kernel/include/relationship.php
===================================================================
diff -u -r3471 -r3491
--- trunk/kernel/include/relationship.php	(.../relationship.php)	(revision 3471)
+++ trunk/kernel/include/relationship.php	(.../relationship.php)	(revision 3491)
@@ -253,11 +253,18 @@
         
     }
 
-    function GetNumPages()
+    function GetNumPages($ItemsPerPage = null)
     {
-        global $objConfig;
-        
-        return ceil($this->NumItems()/$this->PerPage);
+    	if (!isset($ItemsPerPage)) $ItemsPerPage = $this->PerPage;
+    	
+        if ( count($this->Items) )
+        {
+    		global $objConfig;
+        	return ceil($this->NumItems()/$this->PerPage);
+        }
+        else {
+        	return parent::GetNumPages($ItemsPerPage);
+        }
     }
 
     function GetAdminPageLinkList($link_template,$url)
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -r3477 -r3491
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3477)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3491)
@@ -84,17 +84,7 @@
 		$prefix=isset($params['prefix']) ? $params['prefix'] : ''; unset($params['prefix']);
 		$index_file = isset($params['index_file']) ? $params['index_file'] : null; unset($params['index_file']);
 
-		return $this->Application->HREF($t,$prefix,$params,$index_file);
-		
-		/*if( !getArrayValue($params,'no_amp') )
-		{
-			return str_replace('&', '&', $this->Application->HREF($t,$prefix,$params,$index_file));
-		}
-		else
-		{
-			unset($params['no_amp']);
-			return $this->Application->HREF($t,$prefix,$params,$index_file);
-		}*/
+		return $this->Application->HREF($t, $prefix, $params, $index_file);
 	}
 
 	function Link($params)