Author: sevein
Date: Sat Aug 6 10:12:33 2011
New Revision: 9454
Log:
A few fixes after testing 1.1 -> 1.2 migration script
Modified:
trunk/lib/task/migrate/QubitMigrate110.class.php
Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php Sat Aug 6 09:56:44
2011 (r9453)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php Sat Aug 6 10:12:33
2011 (r9454)
@@ -66,7 +66,7 @@
$this->addPerRepositoryPathSetting();
case 67:
- $this->addSeparatorCharacter();
+ $this->addSeparatorCharacterSetting();
case 68:
$this->addThemesMenu();
@@ -428,16 +428,19 @@
*/
protected function setChecksumType()
{
- foreach ($this->data['QubitDigitalObject'] as $key => &$item)
+ if (isset($this->data['QubitDigitalObject']))
{
- if (!isset($item['checksum']) || 0 == strlen($item['checksum']))
+ foreach ($this->data['QubitDigitalObject'] as $key => &$item)
{
- // No checksum, skip
- continue;
- }
+ if (!isset($item['checksum']) || 0 == strlen($item['checksum']))
+ {
+ // No checksum, skip
+ continue;
+ }
- // Used md5 for all checksums previous to r9340
- $item['checksumType'] = 'md5';
+ // Used md5 for all checksums previous to r9340
+ $item['checksumType'] = 'md5';
+ }
}
return $this;
@@ -513,19 +516,22 @@
'label' => array('en' => 'Themes'),
'path' => 'sfPluginAdminPlugin/themes');
- if ($pivotKey = $this->findRowKeyForColumnValue($this->data['QubitMenu'],
'name', 'plugins'))
+ // Introduce themes menu before settings
+ if ($pivotKey = $this->findRowKeyForColumnValue($this->data['QubitMenu'],
'name', 'settings'))
{
- // Introduce themes menu after plugins
- self::insertAfterNestedSet($this->data['QubitMenu'], $pivotKey,
array('QubitMenu_mainmenu_admin_themes' => $themesMenu));
-
- // Update plugins menu path
- $this->data['QubitMenu'][$key]['path'] = 'sfPluginAdminPlugin/plugins';
+ self::insertBeforeNestedSet($this->data['QubitMenu'], $pivotKey,
array('QubitMenu_mainmenu_admin_themes' => $themesMenu));
}
else
{
$this->data['QubitMenu']['QubitMenu_mainmenu_admin_themes'] =
$themesMenu;
}
+ // Update plugins menu path
+ if ($key = $this->findRowKeyForColumnValue($this->data['QubitMenu'],
'name', 'plugins'))
+ {
+ $this->data['QubitMenu'][$key]['path'] = 'sfPluginAdminPlugin/plugins';
+ }
+
return $this;
}
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
