Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
521008a6
Commit
521008a6
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
FIX #5746 chrome php
Try a fix. Not sure it solved all problems reported
parent
b45ea754
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/lib/functions.lib.php
+1
-1
1 addition, 1 deletion
htdocs/core/lib/functions.lib.php
htdocs/core/modules/syslog/mod_syslog_chromephp.php
+9
-2
9 additions, 2 deletions
htdocs/core/modules/syslog/mod_syslog_chromephp.php
with
10 additions
and
3 deletions
htdocs/core/lib/functions.lib.php
+
1
−
1
View file @
521008a6
...
@@ -5365,7 +5365,7 @@ function printCommonFooter($zone='private')
...
@@ -5365,7 +5365,7 @@ function printCommonFooter($zone='private')
print
'<!-- If page_y set, we set scollbar with it -->'
.
"
\n
"
;
print
'<!-- If page_y set, we set scollbar with it -->'
.
"
\n
"
;
print
"page_y=getParameterByName('page_y', 0);"
;
print
"page_y=getParameterByName('page_y', 0);"
;
print
"if (page_y > 0) $('html, body').scrollTop(page_y);"
;
print
"if (page_y > 0) $('html, body').scrollTop(page_y);
\n
"
;
print
'<!-- Set handler to add page_y param on some a href links -->'
.
"
\n
"
;
print
'<!-- Set handler to add page_y param on some a href links -->'
.
"
\n
"
;
print
'jQuery(".reposition").click(function() {
print
'jQuery(".reposition").click(function() {
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/syslog/mod_syslog_chromephp.php
+
9
−
2
View file @
521008a6
...
@@ -121,7 +121,14 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
...
@@ -121,7 +121,14 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
if
(
!
file_exists
(
$conf
->
global
->
SYSLOG_CHROMEPHP_INCLUDEPATH
.
'/ChromePhp.php'
)
&&
!
file_exists
(
$conf
->
global
->
SYSLOG_CHROMEPHP_INCLUDEPATH
.
'/ChromePhp.class.php'
))
if
(
!
file_exists
(
$conf
->
global
->
SYSLOG_CHROMEPHP_INCLUDEPATH
.
'/ChromePhp.php'
)
&&
!
file_exists
(
$conf
->
global
->
SYSLOG_CHROMEPHP_INCLUDEPATH
.
'/ChromePhp.class.php'
))
{
{
$errors
[]
=
$langs
->
trans
(
"ErrorFailedToOpenFile"
,
'ChromePhp.class.php or ChromePhp.php'
);
if
(
is_object
(
$langs
))
// $langs may not be defined yet.
{
$errors
[]
=
$langs
->
trans
(
"ErrorFailedToOpenFile"
,
'ChromePhp.class.php or ChromePhp.php'
);
}
else
{
$errors
[]
=
"ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php"
;
}
}
}
return
$errors
;
return
$errors
;
...
@@ -151,7 +158,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
...
@@ -151,7 +158,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
$res
=
@
include_once
(
'ChromePhp.php'
);
$res
=
@
include_once
(
'ChromePhp.php'
);
if
(
!
$res
)
$res
=@
include_once
(
'ChromePhp.class.php'
);
if
(
!
$res
)
$res
=@
include_once
(
'ChromePhp.class.php'
);
set_include_path
(
$oldinclude
);
set_include_path
(
$oldinclude
);
ob_start
();
// To be sure headers are not flushed until all page is completely processed
ob_start
();
// To be sure headers are not flushed until all page is completely processed
if
(
$content
[
'level'
]
==
LOG_ERR
)
ChromePhp
::
error
(
$content
[
'message'
]);
if
(
$content
[
'level'
]
==
LOG_ERR
)
ChromePhp
::
error
(
$content
[
'message'
]);
elseif
(
$content
[
'level'
]
==
LOG_WARNING
)
ChromePhp
::
warn
(
$content
[
'message'
]);
elseif
(
$content
[
'level'
]
==
LOG_WARNING
)
ChromePhp
::
warn
(
$content
[
'message'
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment