Vergleich install/upgrade.php - 1.6.1 - 1.6.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: upgrade.php 5157 2010-07-31 23:36:15Z RyanGordon $

 * $Id$

 */

 */


if(function_exists("unicode_decode"))
{
// Unicode extension introduced in 6.0
error_reporting(E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_STRICT);
}
elseif(defined("E_DEPRECATED"))
{
// E_DEPRECATED introduced in 5.3
error_reporting(E_ALL ^ E_DEPRECATED ^ E_NOTICE);
}
else
{
error_reporting(E_ALL & ~E_NOTICE);
}

 

define('MYBB_ROOT', dirname(dirname(__FILE__))."/");
define("INSTALL_ROOT", dirname(__FILE__)."/");


define('MYBB_ROOT', dirname(dirname(__FILE__))."/");
define("INSTALL_ROOT", dirname(__FILE__)."/");

Zeile 34Zeile 19
{
date_default_timezone_set('GMT');
}

{
date_default_timezone_set('GMT');
}

 

require_once MYBB_ROOT.'inc/class_error.php';
$error_handler = new errorHandler();


require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;


require_once MYBB_ROOT."inc/class_core.php";
$mybb = new MyBB;

Zeile 229Zeile 217
	}

$output->steps = array($lang->upgrade);

	}

$output->steps = array($lang->upgrade);

	

	

	if($mybb->user['uid'] == 0)
{
$output->print_header("Please Login", "errormsg", 0, 1);

	if($mybb->user['uid'] == 0)
{
$output->print_header("Please Login", "errormsg", 0, 1);

Zeile 339Zeile 327
		require_once INSTALL_ROOT."resources/upgrade".intval($mybb->input['from']).".php";
if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->input['donewarning'] != "true")
{

		require_once INSTALL_ROOT."resources/upgrade".intval($mybb->input['from']).".php";
if($db->table_exists("datacache") && $upgrade_detail['requires_deactivated_plugins'] == 1 && $mybb->input['donewarning'] != "true")
{

			require_once MYBB_ROOT."inc/class_datacache.php";
$cache = new datacache;

 
			$plugins = $cache->read('plugins', true);
if(!empty($plugins['active']))
{

			$plugins = $cache->read('plugins', true);
if(!empty($plugins['active']))
{

Zeile 418Zeile 404
		  status varchar(10) NOT NULL default '',
dateline int(10) NOT NULL default '0',
PRIMARY KEY (tid)

		  status varchar(10) NOT NULL default '',
dateline int(10) NOT NULL default '0',
PRIMARY KEY (tid)

		) TYPE=MyISAM{$charset};");

		) ENGINE=MyISAM{$charset};");

	}

if($system_upgrade_detail['revert_all_themes'] > 0)

	}

if($system_upgrade_detail['revert_all_themes'] > 0)

Zeile 433Zeile 419
		 stylesheets text NOT NULL,
allowedgroups text NOT NULL,
PRIMARY KEY (tid)

		 stylesheets text NOT NULL,
allowedgroups text NOT NULL,
PRIMARY KEY (tid)

		) TYPE=MyISAM{$charset};");

		) ENGINE=MyISAM{$charset};");


$db->drop_table("themestylesheets");
$db->write_query("CREATE TABLE ".TABLE_PREFIX."themestylesheets(


$db->drop_table("themestylesheets");
$db->write_query("CREATE TABLE ".TABLE_PREFIX."themestylesheets(

Zeile 445Zeile 431
			cachefile varchar(100) NOT NULL default '',
lastmodified bigint(30) NOT NULL default '0',
PRIMARY KEY(sid)

			cachefile varchar(100) NOT NULL default '',
lastmodified bigint(30) NOT NULL default '0',
PRIMARY KEY(sid)

		) TYPE=MyISAM{$charset};");

		) ENGINE=MyISAM{$charset};");


$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');
if(file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php"))
{


$contents = @file_get_contents(INSTALL_ROOT.'resources/mybb_theme.xml');
if(file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php"))
{

 
			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php";

			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
}
else if(file_exists(MYBB_ROOT."admin/inc/functions_themes.php"))
{

			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions_themes.php";
}
else if(file_exists(MYBB_ROOT."admin/inc/functions_themes.php"))
{

 
			require_once MYBB_ROOT."admin/inc/functions.php";

			require_once MYBB_ROOT."admin/inc/functions_themes.php";
}
else

			require_once MYBB_ROOT."admin/inc/functions_themes.php";
}
else

Zeile 472Zeile 460
		  sid smallint unsigned NOT NULL auto_increment,
title varchar(120) NOT NULL default '',
PRIMARY KEY (sid)

		  sid smallint unsigned NOT NULL auto_increment,
title varchar(120) NOT NULL default '',
PRIMARY KEY (sid)

		) TYPE=MyISAM{$charset};");

		) ENGINE=MyISAM{$charset};");

		
$db->insert_query("templatesets", array('title' => 'Default Templates'));
}

		
$db->insert_query("templatesets", array('title' => 'Default Templates'));
}

Zeile 544Zeile 532

$output->print_contents($lang->upgrade_templates_reverted_success);
$output->print_footer("rebuildsettings");


$output->print_contents($lang->upgrade_templates_reverted_success);
$output->print_footer("rebuildsettings");

}


}


function buildsettings()
{
global $db, $output, $system_upgrade_detail, $lang;

function buildsettings()
{
global $db, $output, $system_upgrade_detail, $lang;

Zeile 595Zeile 583
	$cache->update_most_replied_threads();
$cache->update_most_viewed_threads();
$cache->update_groupleaders();

	$cache->update_most_replied_threads();
$cache->update_most_viewed_threads();
$cache->update_groupleaders();

 
	$cache->update_threadprefixes();
$cache->update_forumsdisplay();


$contents .= $lang->done."</p>";



$contents .= $lang->done."</p>";


Zeile 788Zeile 778
				  disporder smallint unsigned NOT NULL default '0',
isdefault int(1) NOT NULL default '0',
PRIMARY KEY (gid)

				  disporder smallint unsigned NOT NULL default '0',
isdefault int(1) NOT NULL default '0',
PRIMARY KEY (gid)

				) TYPE=MyISAM;");

				) ENGINE=MyISAM;");

		}

$db->drop_table("settings");

		}

$db->drop_table("settings");

Zeile 835Zeile 825
				  gid smallint unsigned NOT NULL default '0',
isdefault int(1) NOT NULL default '0',
PRIMARY KEY (sid)

				  gid smallint unsigned NOT NULL default '0',
isdefault int(1) NOT NULL default '0',
PRIMARY KEY (sid)

				) TYPE=MyISAM;");

				) ENGINE=MyISAM;");

		}
}
else

		}
}
else

Zeile 848Zeile 838
        {
$wheresettings = "isdefault='1'";
}

        {
$wheresettings = "isdefault='1'";
}

		
$query = $db->simple_select("settings", "name,sid", $wheresettings);
while($setting = $db->fetch_array($query))
{
$settings[$setting['name']] = $setting['sid'];
}










		$query = $db->simple_select("settinggroups", "name,title,gid", $wheresettings);
while($group = $db->fetch_array($query))

		$query = $db->simple_select("settinggroups", "name,title,gid", $wheresettings);
while($group = $db->fetch_array($query))

		{

		{

			$settinggroups[$group['name']] = $group['gid'];

			$settinggroups[$group['name']] = $group['gid'];

 
		}

// Collect all the user's settings - regardless of 'defaultivity' - we'll check them all
// against default settings and insert/update them accordingly
$query = $db->simple_select("settings", "name,sid");
while($setting = $db->fetch_array($query))
{
$settings[$setting['name']] = $setting['sid'];

		}
}
$settings_xml = file_get_contents(INSTALL_ROOT."resources/settings.xml");

		}
}
$settings_xml = file_get_contents(INSTALL_ROOT."resources/settings.xml");

Zeile 1010Zeile 1002
					logging int(1) NOT NULL default '0',
locked bigint(30) NOT NULL default '0',
PRIMARY KEY (tid)

					logging int(1) NOT NULL default '0',
locked bigint(30) NOT NULL default '0',
PRIMARY KEY (tid)

				) TYPE=MyISAM;");

				) ENGINE=MyISAM;");

		}
}
else

		}
}
else