Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
1b093e04
Commit
1b093e04
authored
Aug 20, 2018
by
Cecilia Vela Gurovic
Committed by
Gerrit Code Review
Aug 20, 2018
Browse files
Merge "Bug 1779243: Allowing install to complete for MySql v8"
parents
46b28f8e
3977aeb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/dml.php
View file @
1b093e04
...
...
@@ -1537,7 +1537,7 @@ function configure_dbconnection() {
$db
->
_Execute
(
"SET NAMES 'utf8'"
);
if
(
is_mysql
())
{
$db
->
_Execute
(
"SET SQL_MODE='P
OSTGRESQL
'"
);
$db
->
_Execute
(
"SET SQL_MODE='P
IPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE
'"
);
$db
->
_Execute
(
"SET CHARACTER SET utf8mb4"
);
$db
->
_Execute
(
"SET SQL_BIG_SELECTS=1"
);
}
...
...
htdocs/lib/view.php
View file @
1b093e04
...
...
@@ -794,7 +794,10 @@ class View {
public
function
get_columnsperrow
()
{
if
(
!
isset
(
$this
->
columnsperrow
))
{
$this
->
columnsperrow
=
get_records_assoc
(
'view_rows_columns'
,
'view'
,
$this
->
get
(
'id'
),
'row'
,
'row, columns'
);
$this
->
columnsperrow
=
get_records_sql_assoc
(
'SELECT "row", columns
FROM {view_rows_columns}
WHERE view = ?
ORDER BY "row" ASC'
,
array
(
$this
->
get
(
'id'
)));
}
return
$this
->
columnsperrow
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment