deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Kohana to 3.1.3.1

Browse Source
This commit is contained in:
Deon George
2011-05-16 22:47:16 +10:00
parent 8b658b497a
commit ff2370c368
401 changed files with 14070 additions and 10213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/kohana/modules/userguide/views/userguide/api/class.php
View File

@@ -2,7 +2,7 @@
<?php echo $doc->modifiers, $doc->class->name ?>
<?php $parent = $doc->class; ?>
<?php while ($parent = $parent->getParentClass()): ?>
<br/><small>extends <?php echo HTML::anchor($route->uri(array('class' => $parent->name)), $parent->name) ?></small>
<br/><small>extends <?php echo HTML::anchor($route->uri(array('class' => $parent->name)), $parent->name, NULL, NULL, TRUE) ?></small>
<?php endwhile ?>
</h1>
@@ -21,7 +21,7 @@
<p class="note">
<?php if ($path = $doc->class->getFilename()): ?>
Class declared in <tt><?php echo Kohana::debug_path($path) ?></tt> on line <?php echo $doc->class->getStartLine() ?>.
Class declared in <tt><?php echo Debug::path($path) ?></tt> on line <?php echo $doc->class->getStartLine() ?>.
<?php else: ?>
Class is not declared in a file, it is probably an internal <?php echo html::anchor('http://php.net/manual/class.'.strtolower($doc->class->name).'.php', 'PHP class') ?>.
<?php endif ?>
@@ -60,7 +60,7 @@ Class is not declared in a file, it is probably an internal <?php echo html::anc
<li><a href="#<?php echo $method->method->name ?>"><?php echo $method->method->name ?>()</a></li>
<?php endforeach ?>
<?php else: ?>
<li><em><?php echo __('one'); ?></em></li>
<li><em><?php echo __('None'); ?></em></li>
<?php endif ?>
</ul>
</div>

2
includes/kohana/modules/userguide/views/userguide/api/method.php
View File

@@ -3,7 +3,7 @@
<?php $declares = $doc->method->getDeclaringClass(); ?>
<h3 id="<?php echo $doc->method->name ?>">
<?php echo $doc->modifiers, $doc->method->name ?>( <?php echo $doc->params ? $doc->params_short() : '' ?>)
<small>(defined in <?php echo html::anchor($route->uri(array('class' => $declares->name)), $declares->name) ?>)</small>
<small>(defined in <?php echo html::anchor($route->uri(array('class' => $declares->name)), $declares->name, NULL, NULL, TRUE) ?>)</small>
</h3>
<div class="description">

4
includes/kohana/modules/userguide/views/userguide/api/toc.php
View File

@@ -63,10 +63,10 @@ $(document).ready(function(){
<?php foreach ($classes as $class => $methods): $link = $route->uri(array('class' => $class)) ?>
<div class="class <?php echo Text::alternate('left', 'right') ?>">
<h2><?php echo HTML::anchor($link, $class) ?></h2>
<h2><?php echo HTML::anchor($link, $class, NULL, NULL, TRUE) ?></h2>
<ul class="methods">
<?php foreach ($methods as $method): ?>
<li><?php echo HTML::anchor("{$link}#{$method}", "{$class}::{$method}") ?></li>
<li><?php echo HTML::anchor("{$link}#{$method}", "{$class}::{$method}", NULL, NULL, TRUE) ?></li>
<?php endforeach ?>
</ul>
</div>

2
includes/kohana/modules/userguide/views/userguide/index.php
View File

@@ -7,7 +7,7 @@
<?php foreach($modules as $url => $options): ?>
<p>
<strong><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name']) ?></strong> -
<strong><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></strong> -
<?php echo $options['description'] ?>
</p>

2
includes/kohana/modules/userguide/views/userguide/menu.php
View File

@@ -5,7 +5,7 @@
<ul>
<?php foreach($modules as $url => $options): ?>
<li><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name']) ?></li>
<li><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></li>
<?php endforeach; ?>
</ul>

2
includes/kohana/modules/userguide/views/userguide/page-toc.php
View File

@@ -4,7 +4,7 @@
<?php if ($item['level'] > 1): ?>
<?php echo str_repeat('&nbsp;', ($item['level'] - 1) * 4) ?>
<?php endif ?>
<?php echo HTML::anchor('#'.$item['id'],$item['name']); ?><br />
<?php echo HTML::anchor('#'.$item['id'],$item['name'], NULL, NULL, TRUE); ?><br />
<?php endforeach; ?>
</div>
<?php endif ?>

10
includes/kohana/modules/userguide/views/userguide/template.php
View File

@@ -5,9 +5,9 @@
<title><?php echo $title ?> | Kohana <?php echo __('User Guide'); ?></title>
<?php foreach ($styles as $style => $media) echo HTML::style($style, array('media' => $media), TRUE), "\n" ?>
<?php foreach ($styles as $style => $media) echo HTML::style($style, array('media' => $media), NULL, TRUE), "\n" ?>
<?php foreach ($scripts as $script) echo HTML::script($script, NULL, TRUE), "\n" ?>
<?php foreach ($scripts as $script) echo HTML::script($script, NULL, NULL, TRUE), "\n" ?>
<!--[if lt IE 9]>
<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
@@ -17,7 +17,7 @@
<div id="header">
<div class="container">
<a href="<?php echo Route::url('docs/guide') ?>" id="logo">
<a href="http://kohanaframework.org/" id="logo">
<img src="<?php echo Route::url('docs/media', array('file' => 'img/kohana.png')) ?>" />
</a>
<div id="menu">
@@ -40,7 +40,7 @@
<ul id="breadcrumb">
<?php foreach ($breadcrumb as $link => $title): ?>
<?php if (is_string($link)): ?>
<li><?php echo HTML::anchor($link, $title) ?></li>
<li><?php echo HTML::anchor($link, $title, NULL, NULL, TRUE) ?></li>
<?php else: ?>
<li class="last"><?php echo $title ?></li>
<?php endif ?>
@@ -58,7 +58,7 @@
<?php if (Kohana::$environment === Kohana::PRODUCTION AND empty($hide_disqus)): ?>
<div id="disqus_thread" class="clear"></div>
<script type="text/javascript">
var disqus_identifier = '<?php echo HTML::chars(Request::instance()->uri) ?>';
var disqus_identifier = '<?php echo HTML::chars(Request::current()->uri()) ?>';
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://kohana.disqus.com/embed.js';