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
57dbf1c8
Commit
57dbf1c8
authored
Nov 20, 2007
by
Francois Marier
Browse files
Merge branch 'master' of
git+ssh://git.catalyst.net.nz/git/public/mahara
parents
c2aa02ab
e5c9ff49
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/db/templatemigration.php
View file @
57dbf1c8
...
...
@@ -100,7 +100,7 @@ function upgrade_template_migration() {
$numcolumns
=
count
(
$viewcolumns
);
// Temporary, testing the migration of certain templates only
if
(
$view
->
template
!=
'
blogandprofile
'
)
{
if
(
$view
->
template
!=
'
filelist'
&&
$view
->
template
!=
'PPAE
'
)
{
//log_debug('skipping template, it is not blogreflection');
continue
;
}
...
...
@@ -607,10 +607,18 @@ function upgrade_template_convert_block_to_blockinstance($block, $view) {
return
$bi
;
}
else
if
(
$block
->
artefacttype
==
'image'
)
{
if
(
$block
->
format
==
'listself'
)
{
$blocktype
=
'filedownload'
;
$configdata
=
array
(
'artefactids'
=>
array
(
$block
->
artefact
));
}
else
{
$blocktype
=
'image'
;
$configdata
=
array
(
'artefactid'
=>
$block
->
artefact
,
'width'
=>
(
$view
->
template
==
'gallery'
?
200
:
''
));
}
$bi
=
new
BlockInstance
(
0
,
array
(
'title'
=>
(
$view
->
template
==
'gallery'
?
''
:
$block
->
title
),
'blocktype'
=>
'image'
,
'configdata'
=>
serialize
(
array
(
'artefactid'
=>
$block
->
artefact
,
'width'
=>
(
$view
->
template
==
'gallery'
?
'200'
:
''
))
),
'blocktype'
=>
$blocktype
,
'configdata'
=>
serialize
(
$configdata
),
'view'
=>
$view
->
id
,
));
return
$bi
;
...
...
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