Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	system/helpers/form_helper.php

1 files changed, 18 insertions, 15 deletions

diff --git a/tests/codeigniter/libraries/Calendar_test.php b/tests/codeigniter/libraries/Calendar_test.php
index 952e8a8d2..768bc8573 100644
--- a/tests/codeigniter/libraries/Calendar_test.php
+++ b/tests/codeigniter/libraries/Calendar_test.php
@@ -169,30 +169,33 @@ class Calendar_test extends CI_TestCase {
 		$this->assertEquals(31, $this->calendar->get_total_days(12, 2012));
 	}
 
-	function test_default_template()
+	public function test_default_template()
 	{
 		$array = array(
-			'table_open'				=> '<table border="0" cellpadding="4" cellspacing="0">',
-			'heading_row_start'			=> '<tr>',
+			'table_open'			=> '<table border="0" cellpadding="4" cellspacing="0">',
+			'heading_row_start'		=> '<tr>',
 			'heading_previous_cell'		=> '<th><a href="{previous_url}">&lt;&lt;</a></th>',
 			'heading_title_cell'		=> '<th colspan="{colspan}">{heading}</th>',
-			'heading_next_cell'			=> '<th><a href="{next_url}">&gt;&gt;</a></th>',
-			'heading_row_end'			=> '</tr>',
-			'week_row_start'			=> '<tr>',
-			'week_day_cell'				=> '<td>{week_day}</td>',
-			'week_row_end'				=> '</tr>',
-			'cal_row_start'				=> '<tr>',
-			'cal_cell_start'			=> '<td>',
+			'heading_next_cell'		=> '<th><a href="{next_url}">&gt;&gt;</a></th>',
+			'heading_row_end'		=> '</tr>',
+			'week_row_start'		=> '<tr>',
+			'week_day_cell'			=> '<td>{week_day}</td>',
+			'week_row_end'			=> '</tr>',
+			'cal_row_start'			=> '<tr>',
+			'cal_cell_start'		=> '<td>',
 			'cal_cell_start_today'		=> '<td>',
-			'cal_cell_content'			=> '<a href="{content}">{day}</a>',
+			'cal_cell_content'		=> '<a href="{content}">{day}</a>',
 			'cal_cell_content_today'	=> '<a href="{content}"><strong>{day}</strong></a>',
 			'cal_cell_no_content'		=> '{day}',
 			'cal_cell_no_content_today'	=> '<strong>{day}</strong>',
-			'cal_cell_blank'			=> '&nbsp;',
-			'cal_cell_end'				=> '</td>',
+			'cal_cell_blank'		=> '&nbsp;',
+			'cal_cell_end'			=> '</td>',
 			'cal_cell_end_today'		=> '</td>',
-			'cal_row_end'				=> '</tr>',
-			'table_close'				=> '</table>'
+			'cal_row_end'			=> '</tr>',
+			'table_close'			=> '</table>',
+			'cal_cell_start_other'		=> '<td style="color: #666;">',
+			'cal_cell_other'		=> '{day}',
+			'cal_cell_end_other'		=> '</td>'
 		);
 
 		$this->assertEquals($array, $this->calendar->default_template());