You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ih...@apache.org on 2013/12/14 16:56:30 UTC
[1/2] git commit: Bumped sphinx version to 1.2 (stable)
Updated Branches:
refs/heads/develop 520fdbd17 -> 5fa8da9df
Bumped sphinx version to 1.2 (stable)
Signed-off-by: Ivan Habunek <ih...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/logging-log4php/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4php/commit/9e9c5f2a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4php/tree/9e9c5f2a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4php/diff/9e9c5f2a
Branch: refs/heads/develop
Commit: 9e9c5f2a24704f0e82b6af44ca39e78892ccf1cd
Parents: 520fdbd
Author: Ivan Habunek <ih...@apache.org>
Authored: Sat Dec 14 16:49:19 2013 +0100
Committer: Ivan Habunek <ih...@apache.org>
Committed: Sat Dec 14 16:49:19 2013 +0100
----------------------------------------------------------------------
docs/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/9e9c5f2a/docs/requirements.txt
----------------------------------------------------------------------
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 3ef90b4..bf6ce83 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1 @@
-Sphinx==1.1.3
+Sphinx==1.2
[2/2] git commit: LOG4PHP-205: Avoid warning when getting location
info
Posted by ih...@apache.org.
LOG4PHP-205: Avoid warning when getting location info
debug_backtrace() sometimes does not return 'file' and 'line' values. So
check if they exist before using them.
Signed-off-by: Ivan Habunek <ih...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/logging-log4php/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4php/commit/5fa8da9d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4php/tree/5fa8da9d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4php/diff/5fa8da9d
Branch: refs/heads/develop
Commit: 5fa8da9dfc1ea42f125614ffddac322428aa3f56
Parents: 9e9c5f2
Author: Ivan Habunek <ih...@apache.org>
Authored: Sat Dec 14 16:49:41 2013 +0100
Committer: Ivan Habunek <ih...@apache.org>
Committed: Sat Dec 14 16:49:41 2013 +0100
----------------------------------------------------------------------
src/main/php/LoggerLoggingEvent.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/5fa8da9d/src/main/php/LoggerLoggingEvent.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerLoggingEvent.php b/src/main/php/LoggerLoggingEvent.php
index aa0bae7..e826b9c 100644
--- a/src/main/php/LoggerLoggingEvent.php
+++ b/src/main/php/LoggerLoggingEvent.php
@@ -168,8 +168,12 @@ class LoggerLoggingEvent {
$className = strtolower($hop['class']);
if(!empty($className) and ($className == 'logger' or
strtolower(get_parent_class($className)) == 'logger')) {
- $locationInfo['line'] = $hop['line'];
- $locationInfo['file'] = $hop['file'];
+ if (isset($hop['line'])) {
+ $locationInfo['line'] = $hop['line'];
+ }
+ if (isset($hop['file'])) {
+ $locationInfo['file'] = $hop['file'];
+ }
break;
}
}