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

Fix update error message

Browse Source
This commit is contained in:
e107steved
2009-07-09 21:39:31 +00:00
parent 00738aa23d
commit 99ff33b475
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
e107_admin/update_routines.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $
| $Revision: 1.40 $ | $Revision: 1.41 $
| $Date: 2009-07-09 02:47:11 $ | $Date: 2009-07-09 21:39:31 $
| $Author: e107coders $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -332,17 +332,6 @@ function update_706_to_800($type='')
catch_error(); catch_error();
} }
if($sql->db_Select("plugin", "plugin_category", "plugin_category = ''"))
{
if ($just_check) return update_needed();
require_once(e_HANDLER."plugin_class.php");
$ep = new e107plugin;
$ep -> update_plugins_table();
$updateMessages[] = LAN_UPDATE_24;
// catch_error();
}
//change menu_path for userlanguage_menu //change menu_path for userlanguage_menu
if($sql->db_Select("menus", "menu_path", "menu_path='userlanguage_menu' || menu_path='userlanguage_menu/'")) if($sql->db_Select("menus", "menu_path", "menu_path='userlanguage_menu' || menu_path='userlanguage_menu/'"))
{ {
@@ -688,6 +677,18 @@ function update_706_to_800($type='')
} }
} }
// This has to be done after the table is upgraded
if($sql->db_Select("plugin", "plugin_category", "plugin_category = ''"))
{
if ($just_check) return update_needed();
require_once(e_HANDLER."plugin_class.php");
$ep = new e107plugin;
$ep -> update_plugins_table();
$updateMessages[] = LAN_UPDATE_24;
// catch_error();
}
// Obsolete tables (list at top) // Obsolete tables (list at top)
foreach ($obs_tables as $ot) foreach ($obs_tables as $ot)
{ {
@@ -927,10 +928,10 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
function catch_error(&$target) function catch_error(&$target)
{ {
if ($target->mySQLlastErrText() != '' && E107_DEBUG_LEVEL != 0) if ($target->mySQLlastErrText != '' && E107_DEBUG_LEVEL != 0)
{ {
$tmp2 = debug_backtrace(); $tmp2 = debug_backtrace();
$tmp = $target->mySQLlastErrText(); $tmp = $target->mySQLlastErrText;
echo $tmp." [ ".basename(__FILE__)." on line ".$tmp2[0]['line']."] <br />"; echo $tmp." [ ".basename(__FILE__)." on line ".$tmp2[0]['line']."] <br />";
} }
return; return;