Index: trunk/globals.php =================================================================== diff -u -N -r4865 -r5431 --- trunk/globals.php (.../globals.php) (revision 4865) +++ trunk/globals.php (.../globals.php) (revision 5431) @@ -249,7 +249,7 @@ Function QueryCount($sql) { $sql = preg_replace('/SELECT(.*)FROM[ \n\r](.*)/is','SELECT COUNT(*) AS TableCount FROM $2', $sql); - $sql = preg_replace('/(.*)LIMIT(.*)/is','$1', $sql); + $sql = preg_replace('/(.*)[ \n\r]LIMIT[ \n\r](.*)/is','$1', $sql); $sql = preg_replace('/(.*)ORDER BY(.*)/is','$1', $sql); //echo $sql; @@ -2077,5 +2077,12 @@ } return true; } + + function checkViewPermission($section_name, $system = 1) + { + $application =& kApplication::Instance(); + $application->InitParser(); + $application->ProcessParsedTag('m', 'RequireLogin', Array('permissions' => $section_name.'.view', 'system' => $system, 'index_file' => 'index.php')); + } ?>