From f10306b9e27cf814fc1f11487effadf89a42459d Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 9 Aug 2006 14:00:51 +0000 Subject: [PATCH] Removed tabs --- lib/blocklib.php | 4 ++-- lib/db/migrate2utf8.php | 10 +++++----- lib/db/mysql.php | 32 ++++++++++++++++---------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/blocklib.php b/lib/blocklib.php index 1935b12a360..a402d6319a1 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1006,7 +1006,7 @@ function upgrade_blocks_plugins($continueto) { $invalidblocks[] = $blockname; continue; } - + $fullblock = $CFG->dirroot .'/blocks/'. $blockname; if ( is_readable($fullblock.'/block_'.$blockname.'.php')) { @@ -1195,4 +1195,4 @@ function upgrade_blocks_plugins($continueto) { } } -?> \ No newline at end of file +?> diff --git a/lib/db/migrate2utf8.php b/lib/db/migrate2utf8.php index f910981e80a..4c79cc6aef5 100755 --- a/lib/db/migrate2utf8.php +++ b/lib/db/migrate2utf8.php @@ -75,9 +75,9 @@ function migrate2utf8_user($fields, $crash, $debug, $maxrecords, $done, $tablest // this is the only encoding we need for this table if ($globallang) { - $fromenc = $globallang; - } else { - $fromenc = get_original_encoding('','',$record->lang); + $fromenc = $globallang; + } else { + $fromenc = get_original_encoding('','',$record->lang); } if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) { @@ -126,8 +126,8 @@ function migrate2utf8_user($fields, $crash, $debug, $maxrecords, $done, $tablest //print some output once in a while if (($processedrecords) % 1000 == 0) { - print_progress($done, $tablestoconvert, 5, 1, 'Processing: user'); - } + print_progress($done, $tablestoconvert, 5, 1, 'Processing: user'); + } } } } diff --git a/lib/db/mysql.php b/lib/db/mysql.php index 4c6e2042a0a..c14228879ee 100644 --- a/lib/db/mysql.php +++ b/lib/db/mysql.php @@ -2051,22 +2051,22 @@ function main_upgrade($oldversion=0) { )", true); execute_sql("CREATE TABLE {$CFG->prefix}capabilities ( - `id` int(10) unsigned NOT NULL auto_increment, - `name` varchar(150) NOT NULL default '', - `captype` varchar(50) NOT NULL default '', - `contextlevel` int(10) unsigned NOT NULL default '0', - `component` varchar(100) NOT NULL default '', - PRIMARY KEY (`id`) - )", true); - - execute_sql("CREATE TABLE {$CFG->prefix}role_names ( - `id` int(10) unsigned NOT NULL auto_increment, - `roleid` int(10) unsigned NOT NULL default '0', - `contextid` int(10) unsigned NOT NULL default '0', - `text` text NOT NULL default '', - PRIMARY KEY (`id`) - )", true); - + `id` int(10) unsigned NOT NULL auto_increment, + `name` varchar(150) NOT NULL default '', + `captype` varchar(50) NOT NULL default '', + `contextlevel` int(10) unsigned NOT NULL default '0', + `component` varchar(100) NOT NULL default '', + PRIMARY KEY (`id`) + )", true); + + execute_sql("CREATE TABLE {$CFG->prefix}role_names ( + `id` int(10) unsigned NOT NULL auto_increment, + `roleid` int(10) unsigned NOT NULL default '0', + `contextid` int(10) unsigned NOT NULL default '0', + `text` text NOT NULL default '', + PRIMARY KEY (`id`) + )", true); + }