Upgrade to KH 3.1.3.1

This commit is contained in:
Deon George
2011-05-13 16:00:25 +10:00
parent 8013aadc4c
commit 6d256839fc
675 changed files with 22771 additions and 24111 deletions

View File

@@ -27,7 +27,7 @@ $error_id = uniqid('error');
.js .collapsed { display: none; }
</style>
<script type="text/javascript">
document.documentElement.className = 'js';
document.documentElement.className = document.documentElement.className + ' js';
function koggle(elem)
{
elem = document.getElementById(elem);
@@ -50,15 +50,15 @@ function koggle(elem)
<div id="kohana_error">
<h1><span class="type"><?php echo $type ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo html::chars($message) ?></span></h1>
<div id="<?php echo $error_id ?>" class="content">
<p><span class="file"><?php echo Kohana::debug_path($file) ?> [ <?php echo $line ?> ]</span></p>
<?php echo Kohana::debug_source($file, $line) ?>
<p><span class="file"><?php echo Debug::path($file) ?> [ <?php echo $line ?> ]</span></p>
<?php echo Debug::source($file, $line) ?>
<ol class="trace">
<?php foreach (Kohana::trace($trace) as $i => $step): ?>
<?php foreach (Debug::trace($trace) as $i => $step): ?>
<li>
<p>
<span class="file">
<?php if ($step['file']): $source_id = $error_id.'source'.$i; ?>
<a href="#<?php echo $source_id ?>" onclick="return koggle('<?php echo $source_id ?>')"><?php echo Kohana::debug_path($step['file']) ?> [ <?php echo $step['line'] ?> ]</a>
<a href="#<?php echo $source_id ?>" onclick="return koggle('<?php echo $source_id ?>')"><?php echo Debug::path($step['file']) ?> [ <?php echo $step['line'] ?> ]</a>
<?php else: ?>
{<?php echo __('PHP internal call') ?>}
<?php endif ?>
@@ -72,7 +72,7 @@ function koggle(elem)
<?php foreach ($step['args'] as $name => $arg): ?>
<tr>
<td><code><?php echo $name ?></code></td>
<td><pre><?php echo Kohana::dump($arg) ?></pre></td>
<td><pre><?php echo Debug::dump($arg) ?></pre></td>
</tr>
<?php endforeach ?>
</table>
@@ -94,7 +94,7 @@ function koggle(elem)
<table cellspacing="0">
<?php foreach ($included as $file): ?>
<tr>
<td><code><?php echo Kohana::debug_path($file) ?></code></td>
<td><code><?php echo Debug::path($file) ?></code></td>
</tr>
<?php endforeach ?>
</table>
@@ -105,7 +105,7 @@ function koggle(elem)
<table cellspacing="0">
<?php foreach ($included as $file): ?>
<tr>
<td><code><?php echo Kohana::debug_path($file) ?></code></td>
<td><code><?php echo Debug::path($file) ?></code></td>
</tr>
<?php endforeach ?>
</table>
@@ -118,7 +118,7 @@ function koggle(elem)
<?php foreach ($GLOBALS[$var] as $key => $value): ?>
<tr>
<td><code><?php echo HTML::chars($key) ?></code></td>
<td><pre><?php echo Kohana::dump($value) ?></pre></td>
<td><pre><?php echo Debug::dump($value) ?></pre></td>
</tr>
<?php endforeach ?>
</table>

View File

@@ -8,7 +8,7 @@ file_put_contents('logo.php', "<?php
/**
* Kohana Logo, base64_encoded PNG
*
* @copyright (c) 2008-2010 Kohana Team
* @license http://kohanaphp.com/license.html
* @copyright (c) 2008-2011 Kohana Team
* @license http://kohanaframework.org/license
*/
return array('mime' => 'image/png', 'data' => '{$data}'); ?>");

File diff suppressed because one or more lines are too long

0
includes/kohana/system/views/profiler/stats.php Executable file → Normal file
View File