mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2016-02-29 10:30:10 +08:00
parent 9496e4a42e d332870bef
commit d93d0feb2a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tpl/think_exception.tpl
View File

@@ -177,13 +177,13 @@
</div> </div>
</h1> </h1>
<div class="source-code"> <div class="source-code">
<pre class="prettyprint lang-php"><ol start="<?php echo $source['first']; ?>"><?php foreach ($source['source'] as $key => $value) { ?><li class="line-<?php echo $key + $source['first']; ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre> <pre class="prettyprint lang-php"><ol start="<?php echo $source['first']; ?>"><?php foreach ((array) $source['source'] as $key => $value) { ?><li class="line-<?php echo $key + $source['first']; ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
</div> </div>
<div class="trace"> <div class="trace">
<h3>Call Stack</h3> <h3>Call Stack</h3>
<ol> <ol>
<li><?php echo sprintf('in %s', parse_file($file, $line)); ?></li> <li><?php echo sprintf('in %s', parse_file($file, $line)); ?></li>
<?php foreach ($trace as $value) { ?> <?php foreach ((array) $trace as $value) { ?>
<li> <li>
<?php <?php
// Show Function // Show Function
@@ -211,14 +211,14 @@
<?php if(!empty($datas)){ ?> <?php if(!empty($datas)){ ?>
<div class="exception-var"> <div class="exception-var">
<h2>Exception Datas</h2> <h2>Exception Datas</h2>
<?php foreach ($datas as $label => $value) { ?> <?php foreach ((array) $datas as $label => $value) { ?>
<table> <table>
<?php if(empty($value)){ ?> <?php if(empty($value)){ ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ($value as $key => $val) { ?> <?php foreach ((array) $value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td> <td>
@@ -243,14 +243,14 @@
<div class="exception-var"> <div class="exception-var">
<h2>Environment Variables</h2> <h2>Environment Variables</h2>
<?php foreach ($tables as $label => $value) { ?> <?php foreach ((array) $tables as $label => $value) { ?>
<table> <table>
<?php if(empty($value)){ ?> <?php if(empty($value)){ ?>
<caption><?php echo $label; ?><small>empty</small></caption> <caption><?php echo $label; ?><small>empty</small></caption>
<?php } else { ?> <?php } else { ?>
<caption><?php echo $label; ?></caption> <caption><?php echo $label; ?></caption>
<tbody> <tbody>
<?php foreach ($value as $key => $val) { ?> <?php foreach ((array) $value as $key => $val) { ?>
<tr> <tr>
<td><?php echo htmlentities($key); ?></td> <td><?php echo htmlentities($key); ?></td>
<td> <td>
@@ -369,23 +369,27 @@
</body> </body>
</html> </html>
<?php <?php
if (!function_exists('parse_padding')) {
function parse_padding($source) function parse_padding($source)
{ {
$length = strlen(strval(count($source['source']) + $source['first'])); $length = strlen(strval(count($source['source']) + $source['first']));
return 40 + ($length - 1) * 8; return 40 + ($length - 1) * 8;
} }
}
if (!function_exists('parse_class')) {
function parse_class($name) function parse_class($name)
{ {
$names = explode('\\', $name); $names = explode('\\', $name);
return '<abbr title="'.$name.'">'.end($names).'</abbr>'; return '<abbr title="'.$name.'">'.end($names).'</abbr>';
} }
}
if (!function_exists('parse_file')) {
function parse_file($file, $line) function parse_file($file, $line)
{ {
return '<a class="toggle" title="'."{$file} line {$line}".'">'.basename($file)." line {$line}".'</a>'; return '<a class="toggle" title="'."{$file} line {$line}".'">'.basename($file)." line {$line}".'</a>';
} }
}
if (!function_exists('parse_args')) {
function parse_args($args) function parse_args($args)
{ {
$result = []; $result = [];
@@ -436,3 +440,4 @@
return implode(', ', $result); return implode(', ', $result);
} }
}