From: <lph...@us...> - 2012-12-10 13:58:01
|
Revision: 44226 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=44226&view=rev Author: lphuberdeau Date: 2012-12-10 13:57:52 +0000 (Mon, 10 Dec 2012) Log Message: ----------- [MRG] Automatic merge, branches/10.x 44213 to 44225 Modified Paths: -------------- trunk/lib/graph-engine/core.php trunk/lib/wiki-plugins/wikiplugin_listpages.php Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/10.x:43596-44213 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409,42630 /branches/7.x:33633-36216,36238,36257,36453 /branches/8.x:37900-39390,39479 /branches/9.x:40481-43296,43384,43499 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/foreign-storage:34822-34895 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 + /branches/10.x:43596-44225 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409,42630 /branches/7.x:33633-36216,36238,36257,36453 /branches/8.x:37900-39390,39479 /branches/9.x:40481-43296,43384,43499 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/foreign-storage:34822-34895 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 Modified: trunk/lib/graph-engine/core.php =================================================================== --- trunk/lib/graph-engine/core.php 2012-12-10 13:44:09 UTC (rev 44225) +++ trunk/lib/graph-engine/core.php 2012-12-10 13:57:52 UTC (rev 44226) @@ -511,7 +511,7 @@ die( "Abstract Function Call" ); } - function _drawLegendBox( &$renderer ) // {{{2 + function _drawLegendBox( &$renderer, $color ) // {{{2 { die( "Abstract Function Call" ); } Modified: trunk/lib/wiki-plugins/wikiplugin_listpages.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_listpages.php 2012-12-10 13:44:09 UTC (rev 44225) +++ trunk/lib/wiki-plugins/wikiplugin_listpages.php 2012-12-10 13:57:52 UTC (rev 44226) @@ -25,7 +25,7 @@ 'required' => false, 'name' => tra('Max'), 'description' => tra('Limit number of items displayed in the list. Default is to display all.'), - 'filter' => 'digits', + 'filter' => 'int', 'default' => -1, ), 'initial' => array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |