# HG changeset patch # User Dan # Date 1232209972 18000 # Node ID 12e0991938503ce90389782d4bd263408ef7bceb # Parent 42419c99471c899d8a4eabe22f3035b55506d72d# Parent f379fdf3b4d7d9b37aa5df61a33889aabe1dda27 Merging branches diff -r 42419c99471c -r 12e099193850 .hgtags --- a/.hgtags Sat Jan 17 11:32:18 2009 -0500 +++ b/.hgtags Sat Jan 17 11:32:52 2009 -0500 @@ -7,3 +7,4 @@ 8be996c3740dccf30ea470a597cd28bf9ce38cfb 1.0.3 72ecb951b3137f7cb0f07dea50a7dcf2aa323382 1.0.4 72ecb951b3137f7cb0f07dea50a7dcf2aa323382 current-stable +36bcc9212837aab62e34fa66f0d600651d2a4814 1.0.5 diff -r 42419c99471c -r 12e099193850 index.php --- a/index.php Sat Jan 17 11:32:18 2009 -0500 +++ b/index.php Sat Jan 17 11:32:52 2009 -0500 @@ -59,7 +59,21 @@ switch($_GET['do']) { default: - die_friendly('Invalid action', '

The action "'.htmlspecialchars($_GET['do']).'" is not defined. Return to viewing this page\'s text.

'); + $code = $plugins->setHook('page_action'); + ob_start(); + foreach ( $code as $cmd ) + { + eval($cmd); + } + if ( $contents = ob_get_contents() ) + { + ob_end_clean(); + echo $contents; + } + else + { + die_friendly('Invalid action', '

The action "'.htmlspecialchars($_GET['do']).'" is not defined. Return to viewing this page\'s text.

'); + } break; case 'view': // echo PageUtils::getpage($paths->page, true, ( (isset($_GET['oldid'])) ? $_GET['oldid'] : false ));