[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[30671] branches/6.x/lib

[<jon...@us...>]

Revision: 30671
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30671&view=rev
Author:   jonnybradley
Date:     2010-11-12 18:20:53 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
[bp/r30467][ENH] wikiplugin_category: Added maxRecords param with default of 50 (added param to get_categoryobjects() but left default as before at 500)

Modified Paths:
--------------
    branches/6.x/lib/categories/categlib.php
    branches/6.x/lib/wiki-plugins/wikiplugin_category.php

Modified: branches/6.x/lib/categories/categlib.php
===================================================================
--- branches/6.x/lib/categories/categlib.php	2010-11-12 18:19:09 UTC (rev 30670)
+++ branches/6.x/lib/categories/categlib.php	2010-11-12 18:20:53 UTC (rev 30671)
@@ -1142,7 +1142,7 @@
     }
     
     //Moved from tikilib.php
-    function get_categoryobjects($catids,$types="*",$sort='created_desc',$split=true,$sub=false,$and=false) {
+    function get_categoryobjects($catids,$types="*",$sort='created_desc',$split=true,$sub=false,$and=false, $maxRecords = 500) {
 			global $smarty, $prefs;
 
 		$typetokens = array(
@@ -1188,7 +1188,6 @@
 		$find = "";
 		$offset = 0;
 		$firstpassed = false;
-		$maxRecords = 500;
 		$typesallowed = array();
 		if ($and) {
 			$split = false;

Modified: branches/6.x/lib/wiki-plugins/wikiplugin_category.php
===================================================================
--- branches/6.x/lib/wiki-plugins/wikiplugin_category.php	2010-11-12 18:19:09 UTC (rev 30670)
+++ branches/6.x/lib/wiki-plugins/wikiplugin_category.php	2010-11-12 18:20:53 UTC (rev 30671)
@@ -110,6 +110,13 @@
 				'default' => 'y',
 				'filter' => 'alpha',
 			),		
+			'maxRecords' => array(
+				'required' => false,
+				'name' => tra('Max Records'),
+				'description' => 'Maximum number of objects to list. Default 50.',
+				'default' => '50',
+				'filter' => 'digits',
+			),		
 		),
 	);
 }
@@ -125,7 +132,7 @@
 		return "<span class='warn'>" . tra("Categories are disabled"). "</span>";
 	}
 
-	$default = array('one' => 'n', 'showlinks' => 'y', 'categoryshowlink'=>'y');
+	$default = array('one' => 'n', 'showlinks' => 'y', 'categoryshowlink'=>'y', 'maxRecords' => 50);
 	$params = array_merge($default, $params);
 	extract ($params,EXTR_SKIP);
 
@@ -168,5 +175,5 @@
 	}
 	$smarty->assign('params', $params);
 
-	return "~np~". $categlib->get_categoryobjects($id,$types,$sort,$split,$sub,$and)."~/np~";
+	return "~np~". $categlib->get_categoryobjects($id,$types,$sort,$split,$sub,$and, $maxRecords)."~/np~";
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.