Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
e2e5a5a3
Commit
e2e5a5a3
authored
11 years ago
by
Giovannoni Laurent
Browse files
Options
Downloads
Patches
Plain Diff
fix: pb with oracle
parent
73fb0f49
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
core/trunk/core/class/class_db.php
+17
-3
17 additions, 3 deletions
core/trunk/core/class/class_db.php
core/trunk/core/class/class_functions.php
+0
-2
0 additions, 2 deletions
core/trunk/core/class/class_functions.php
with
17 additions
and
5 deletions
core/trunk/core/class/class_db.php
+
17
−
3
View file @
e2e5a5a3
...
...
@@ -317,8 +317,12 @@ class dbquery extends functions
* if not catched, the error is displayed (false by default)
* @param $noFilter bool true if you don't want to filter on ; and --
*/
public
function
query
(
$sqlQuery
,
$catchError
=
false
,
$noFilter
=
false
)
{
public
function
query
(
$sqlQuery
,
$catchError
=
false
,
$noFilter
=
false
,
&
$params
=
array
()
)
{
if
(
!
$this
->
_sqlLink
)
{
$this
->
connect
();
}
...
...
@@ -363,7 +367,7 @@ class dbquery extends functions
case
'ORACLE'
:
$this
->
query
=
@
oci_parse
(
$this
->
_sqlLink
,
$sqlQuery
);
if
(
$this
->
query
==
false
)
{
if
(
$catchError
)
return
false
;
$this
->
_sqlError
=
6
;
...
...
@@ -371,11 +375,21 @@ class dbquery extends functions
exit
();
}
else
{
if
(
count
(
$params
)
>
0
)
{
//echo "<br/>Params to bind:"; var_dump($params);
foreach
(
$params
as
$paramname
=>
&
$paramvar
)
{
$binded
=
oci_bind_by_name
(
$this
->
query
,
$paramname
,
$paramvar
,
-
1
,
SQLT_CHR
);
}
}
if
(
!
@
oci_execute
(
$this
->
query
))
{
if
(
$catchError
)
return
false
;
$this
->
_sqlError
=
3
;
$this
->
error
();
}
if
(
count
(
$params
)
>
0
)
{
//echo "<br/>Params after execution: "; var_dump($params);
}
}
break
;
...
...
This diff is collapsed.
Click to expand it.
core/trunk/core/class/class_functions.php
+
0
−
2
View file @
e2e5a5a3
...
...
@@ -495,7 +495,6 @@ class functions
{
var
link1
=
document
.
createElement
(
"
a
"
);
link1
.
href
=
'
<?php
echo
$_SESSION
[
'location_bar'
][
'level1'
][
'path'
];
?>
'
;
// link1.href='
<?php
echo
preg_replace
(
"/(&(?!amp;))/"
,
"&"
,
$_SESSION
[
'location_bar'
][
'level1'
][
'path'
]);
?>
'
;
var
label1
=
document
.
createTextNode
(
"
<?php
echo
$_SESSION
[
'location_bar'
][
'level1'
][
'label'
];
?>
"
);
link1
.
appendChild
(
label1
);
bar
.
appendChild
(
link1
);
...
...
@@ -511,7 +510,6 @@ class functions
if
(
bar
!=
null
)
{
var
link1
=
document
.
createElement
(
"
a
"
);
//link1.href='
<?php
echo
preg_replace
(
"/(&(?!amp;))/"
,
"&"
,
$_SESSION
[
'location_bar'
][
'level1'
][
'path'
]);
?>
'
;
link1
.
href
=
'
<?php
echo
$_SESSION
[
'location_bar'
][
'level1'
][
'path'
];
?>
'
;
var
label1
=
document
.
createTextNode
(
"
<?php
echo
$_SESSION
[
'location_bar'
][
'level1'
][
'label'
];
?>
"
);
link1
.
appendChild
(
label1
);
...
...
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