Permalink
Browse files

Merge pull request #40 from shadlaws/fix_20130906

Update to newest kohana3 on 3.3/develop - now v3.3.1.
  • Loading branch information...
2 parents 46a503a + 8d55e54 commit 30f2c54829ea57daf8f86b0de80aa6e8b0094d1b @shadlaws shadlaws committed Sep 6, 2013
@@ -124,7 +124,6 @@ public static function set($name, $value, $expiration = NULL)
*
* @param string $name cookie name
* @return boolean
- * @uses Cookie::set
*/
public static function delete($name)
{
@@ -16,8 +16,8 @@
class Kohana_Core {
// Release version and codename
- const VERSION = '3.3.0';
- const CODENAME = 'badius';
+ const VERSION = '3.3.1';
+ const CODENAME = 'peregrinus';
// Common environment type constants for consistency and convenience
const PRODUCTION = 10;
@@ -49,7 +49,7 @@ function koggle(elem)
}
</script>
<div id="kohana_error">
- <h1><span class="type"><?php echo $class ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo HTML::chars($message) ?></span></h1>
+ <h1><span class="type"><?php echo $class ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo htmlspecialchars( (string) $message, ENT_QUOTES, Kohana::$charset, TRUE); ?></span></h1>
<div id="<?php echo $error_id ?>" class="content">
<p><span class="file"><?php echo Debug::path($file) ?> [ <?php echo $line ?> ]</span></p>
<?php echo Debug::source($file, $line) ?>
@@ -118,7 +118,7 @@ function koggle(elem)
<table cellspacing="0">
<?php foreach ($GLOBALS[$var] as $key => $value): ?>
<tr>
- <td><code><?php echo HTML::chars($key) ?></code></td>
+ <td><code><?php echo htmlspecialchars( (string) $key, ENT_QUOTES, Kohana::$charset, TRUE); ?></code></td>
<td><pre><?php echo Debug::dump($value) ?></pre></td>
</tr>
<?php endforeach ?>
@@ -1,6 +1,6 @@
{
"require": {
- "phpunit/phpunit": "3.7.5",
+ "phpunit/phpunit": "3.7.24",
"phing/phing": "dev-master"
}
}
@@ -124,7 +124,6 @@ public static function set($name, $value, $expiration = NULL)
*
* @param string $name cookie name
* @return boolean
- * @uses Cookie::set
*/
public static function delete($name)
{
@@ -16,8 +16,8 @@
class Kohana_Core {
// Release version and codename
- const VERSION = '3.3.0';
- const CODENAME = 'badius';
+ const VERSION = '3.3.1';
+ const CODENAME = 'peregrinus';
// Common environment type constants for consistency and convenience
const PRODUCTION = 10;
@@ -49,7 +49,7 @@ function koggle(elem)
}
</script>
<div id="kohana_error">
- <h1><span class="type"><?php echo $class ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo HTML::chars($message) ?></span></h1>
+ <h1><span class="type"><?php echo $class ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo htmlspecialchars( (string) $message, ENT_QUOTES, Kohana::$charset, TRUE); ?></span></h1>
<div id="<?php echo $error_id ?>" class="content">
<p><span class="file"><?php echo Debug::path($file) ?> [ <?php echo $line ?> ]</span></p>
<?php echo Debug::source($file, $line) ?>
@@ -118,7 +118,7 @@ function koggle(elem)
<table cellspacing="0">
<?php foreach ($GLOBALS[$var] as $key => $value): ?>
<tr>
- <td><code><?php echo HTML::chars($key) ?></code></td>
+ <td><code><?php echo htmlspecialchars( (string) $key, ENT_QUOTES, Kohana::$charset, TRUE); ?></code></td>
<td><pre><?php echo Debug::dump($value) ?></pre></td>
</tr>
<?php endforeach ?>

0 comments on commit 30f2c54

Please sign in to comment.