This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/date.php b/classes/kohana/date.php | |
index 0a2e10b..2f5aa7e 100644 | |
--- a/classes/kohana/date.php | |
+++ b/classes/kohana/date.php | |
@@ -584,10 +584,9 @@ class Kohana_Date { | |
* @param string $datetime_str datetime string | |
* @param string $timestamp_format timestamp format | |
* @param string $timezone timezone identifier | |
- * @param bool $is_timestamp Boolean indicating if $datetime_str is a unix timestamp | |
* @return string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/kohana/exception.php b/classes/kohana/kohana/exception.php | |
index 947d932..d66aeb6 100644 | |
--- a/classes/kohana/kohana/exception.php | |
+++ b/classes/kohana/kohana/exception.php | |
@@ -144,8 +144,7 @@ class Kohana_Kohana_Exception extends Exception { | |
$error = Kohana_Exception::text($e); | |
// Add this exception to the log | |
- Kohana::$log->add(Log::ERROR, $error); | |
- Kohana::$log->add(Log::STRACE, $error."\n--\n" . $e->getTraceAsString()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/kohana/exception.php b/classes/kohana/kohana/exception.php | |
index 947d932..d66aeb6 100644 | |
--- a/classes/kohana/kohana/exception.php | |
+++ b/classes/kohana/kohana/exception.php | |
@@ -144,8 +144,7 @@ class Kohana_Kohana_Exception extends Exception { | |
$error = Kohana_Exception::text($e); | |
// Add this exception to the log | |
- Kohana::$log->add(Log::ERROR, $error); | |
- Kohana::$log->add(Log::STRACE, $error."\n--\n" . $e->getTraceAsString()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/kohana/exception.php b/classes/kohana/kohana/exception.php | |
index 947d932..d66aeb6 100644 | |
--- a/classes/kohana/kohana/exception.php | |
+++ b/classes/kohana/kohana/exception.php | |
@@ -144,8 +144,7 @@ class Kohana_Kohana_Exception extends Exception { | |
$error = Kohana_Exception::text($e); | |
// Add this exception to the log | |
- Kohana::$log->add(Log::ERROR, $error); | |
- Kohana::$log->add(Log::STRACE, $error."\n--\n" . $e->getTraceAsString()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run'); | |
/** | |
* Tests the HTTP class | |
* | |
* @group kohana | |
* @group kohana.http | |
* | |
* @package Kohana | |
* @category Tests |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/http/exception/300.php b/classes/http/exception/300.php | |
deleted file mode 100644 | |
index 717628d..0000000 | |
--- a/classes/http/exception/300.php | |
+++ /dev/null | |
@@ -1,3 +0,0 @@ | |
-<?php defined('SYSPATH') or die('No direct script access.'); | |
- | |
-class HTTP_Exception_300 extends Kohana_HTTP_Exception_300 {} | |
\ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/http/exception/300.php b/classes/http/exception/300.php | |
deleted file mode 100644 | |
index 717628d..0000000 | |
--- a/classes/http/exception/300.php | |
+++ /dev/null | |
@@ -1,3 +0,0 @@ | |
-<?php defined('SYSPATH') or die('No direct script access.'); | |
- | |
-class HTTP_Exception_300 extends Kohana_HTTP_Exception_300 {} | |
\ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php defined('SYSPATH') or die('No direct script access.'); | |
/** | |
* | |
* | |
* @package OAuth2 | |
* @category Library | |
* @author Managed I.T. | |
* @copyright (c) 2011 Managed I.T. | |
* @license https://github.com/managedit/kohana-oauth2/blob/master/LICENSE.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/classes/kohana/oauth2/consumer.php b/classes/kohana/oauth2/consumer.php | |
index 1b067f5..98aebc7 100644 | |
--- a/classes/kohana/oauth2/consumer.php | |
+++ b/classes/kohana/oauth2/consumer.php | |
@@ -44,8 +44,16 @@ abstract class Kohana_OAuth2_Consumer { | |
{ | |
$this->_config = Kohana::$config->load('oauth2.consumer'); | |
$this->_provider = $provider; | |
- $this->_token = $token; | |
$this->_grant_type = OAuth2_Consumer_GrantType::factory($this->_config[$provider]['grant_type'], $provider); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
// Get a token .. | |
$provider = $this->request->param('provider'); | |
$consumer = OAuth2_Consumer::factory($provider); | |
$token = $consumer->request_token(array('code' => $this->request->query('code'))); | |
Session::instance()->set('oauth2.token.'.$provider, $token); |