Skip to content
GitLab
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
d0548af9
Commit
d0548af9
authored
Oct 18, 2010
by
Alan McNatty
Browse files
Manually managed merge
parent
58098a0c
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/db/upgrade.php
View file @
d0548af9
...
...
@@ -2193,14 +2193,6 @@ function xmldb_core_upgrade($oldversion=0) {
);
}
<<<<<<<
HEAD
if
(
$oldversion
<
2010100821
)
{
execute_sql
(
'ALTER TABLE {usr} ADD COLUMN mobileuploadtoken CHARACTER VARYING(255)'
);
set_config
(
'mobileuploadtoken'
,
1
);
}
=======
if
(
$oldversion
<
2010100702
)
{
// Add general notification cleanup cron
if
(
!
record_exists
(
'cron'
,
'callfunction'
,
'cron_clean_internal_activity_notifications'
))
{
...
...
@@ -2215,6 +2207,10 @@ function xmldb_core_upgrade($oldversion=0) {
}
}
>>>>>>>
456
a2f1afcc6e0bcd907aaef00a9ed543e3bd99d
if
(
$oldversion
<
2010100821
)
{
execute_sql
(
'ALTER TABLE {usr} ADD COLUMN mobileuploadtoken CHARACTER VARYING(255)'
);
set_config
(
'mobileuploadtoken'
,
1
);
}
return
$status
;
}
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment