Merge branch 'release/3.1.1' into 3.1/master

kohana · Feb 16, 2011 · a7d7fdb · a7d7fdb
2 parents 748b8d1 + ac22963
commit a7d7fdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -100,5 +100,8 @@
 // Bootstrap the application
 require APPPATH.'bootstrap'.EXT;
 
+// Disable output buffering
+ob_end_flush();
+
 // Enable the unittest module
 Kohana::modules(Kohana::modules() + array('unittest' => MODPATH.'unittest'));
diff --git a/classes/controller/unittest.php b/classes/controller/unittest.php
@@ -164,7 +164,7 @@ public function action_report()
 
 			$runner->generate_report($group, $path, FALSE);
 
-			$this->request->redirect(URL::base(FALSE, TRUE).$folder.'index.html');
+			$this->request->redirect(URL::site($folder.'index.html', $this->request));
 		}
 	}
 
@@ -227,6 +227,7 @@ public function action_run()
 			->set('group',  Arr::get($this->get_groups_list($suite), reset($group), 'All groups'))
 			->set('groups', $this->get_groups_list($suite))
 
+			->set('run_uri',        $this->request->uri())
 			->set('report_uri',     $this->report_uri.url::query())
 
 			// Whitelist related stuff

diff --git a/views/unittest/results.php b/views/unittest/results.php
@@ -2,7 +2,7 @@
 <div id="header" class="results">
 	<fieldset id="results-options">
 		<legend>Options</legend>
-		<?php echo Form::open(NULL, array('method' => 'get'));?>
+		<?php echo Form::open($run_uri, array('method' => 'get'));?>
 		<?php echo Form::label('group', __('Switch Group')) ?>
 		<?php echo Form::select('group', $groups, $group, array('id' => 'group'));?>
 		<?php if ($xdebug_enabled): ?>