mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Fixes #1109 - Update Routine page/menu fix.

Browse Source
This commit is contained in:
Cameron
2015-08-25 12:58:52 -07:00
parent cffb369751
commit 36ccfecf23
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/update_routines.php
View File

@@ -128,7 +128,10 @@ if (!$dont_check_update)
} }
// set 'master' to true to prevent other upgrades from running before it is complete. // set 'master' to true to prevent other upgrades from running before it is complete.
$dbupdate['706_to_800'] = array('master'=>true, 'title'=> e107::getParser()->lanVars(LAN_UPDATE_4, array('1.x','2.0')), 'message'=> LAN_UPDATE_29);
$LAN_UPDATE_4 = deftrue('LAN_UPDATE_4',"Update from [x] to [y]"); // in case language-pack hasn't been upgraded.
$dbupdate['706_to_800'] = array('master'=>true, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('1.x','2.0')), 'message'=> LAN_UPDATE_29);
$dbupdate['core_prefs'] = array('master'=>true, 'title'=> LAN_UPDATE_13); // Prefs check $dbupdate['core_prefs'] = array('master'=>true, 'title'=> LAN_UPDATE_13); // Prefs check
// $dbupdate['70x_to_706'] = LAN_UPDATE_8.' .70x '.LAN_UPDATE_9.' .706'; // $dbupdate['70x_to_706'] = LAN_UPDATE_8.' .70x '.LAN_UPDATE_9.' .706';
} // End if (!$dont_check_update) } // End if (!$dont_check_update)
@@ -1050,12 +1053,17 @@ function update_706_to_800($type='')
return update_needed("Pages/Menus Table requires updating."); return update_needed("Pages/Menus Table requires updating.");
} }
if($sql->update('page',"menu_name = page_theme, menu_title = page_title, menu_text = page_text, menu_template='default', page_title = '', page_text = '' WHERE page_theme !='' AND menu_title = '' AND menu_text = '' ")) if($sql->update('page',"menu_name = page_theme, menu_title = page_title, menu_text = page_text, menu_template='default', page_title = '', page_text = '' WHERE page_theme !='' AND menu_title = '' AND menu_text IS NULL "))
{ {
$sql->gen("ALTER TABLE `#page` DROP page_theme "); $sql->gen("ALTER TABLE `#page` DROP page_theme ");
$mes = e107::getMessage(); $mes = e107::getMessage();
$log->addDebug("Successfully updated pages/menus table to new format. "); $log->addDebug("Successfully updated pages/menus table to new format. ");
} }
else
{
$log->addDebug("FAILED to update pages/menus table to new format. ");
//$sql->gen("ALTER TABLE `#page` DROP page_theme ");
}
} }