Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 25 deletions

diff --git a/system/views/kohana_profiler_table.php b/system/views/kohana_profiler_table.php
deleted file mode 100644
index b6b46530..00000000
--- a/system/views/kohana_profiler_table.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.'); ?>
-<table class="kp-table">
-<?php
-foreach ($rows as $row):
-
-$class = empty($row['class']) ? '' : ' class="'.$row['class'].'"';
-$style = empty($row['style']) ? '' : ' style="'.$row['style'].'"';
-?>
-	<tr<?php echo $class; echo $style; ?>>
-		<?php
-		foreach ($columns as $index => $column)
-		{
-			$class = empty($column['class']) ? '' : ' class="'.$column['class'].'"';
-			$style = empty($column['style']) ? '' : ' style="'.$column['style'].'"';
-			$value = $row['data'][$index];
-			$value = (is_array($value) OR is_object($value)) ? '<pre>'.html::specialchars(print_r($value, TRUE)).'</pre>' : html::specialchars($value);
-			echo '<td', $style, $class, '>', $value, '</td>';
-		}
-		?>
-	</tr>
-<?php
-
-endforeach;
-?>
-</table>
\ No newline at end of file