LOL
-- Art
(I also reinstalled 1.7 and chased some bugs too...)
execute_sql('ALTER TABLE '. $CFG->prefix . $table .' RENAME COLUMN '. $field .' TO '. $realfield);Claims that $realfield already exists, even though the previous line of code should have dropped that column. Hoever, the drop statement was not even being attempted. Unfortunately, Petr's update logging code seems to have a bug, and it stopped recording after the first error, so I don't have a record of exactly what happened.
Index: mod/forum/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
retrieving revision 1.447
diff -u -r1.447 lib.php
--- mod/forum/lib.php 9 Aug 2006 09:18:31 -0000 1.447
+++ mod/forum/lib.php 9 Aug 2006 10:09:15 -0000
@@ -1712,7 +1712,7 @@
}
$output .= '<div class="subject">'.format_string($post->subject).'</div>';
- $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $modcontext->id););
+ $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $modcontext->id));
$by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id.'">'.$fullname.'</a>';
$by->date = userdate($post->modified, '', $touser->timezone);
$output .= '<div class="author">'.get_string('bynameondate', 'forum', $by).'</div>';
Index: lib/db/postgres7.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/postgres7.php,v
retrieving revision 1.195
diff -u -r1.195 postgres7.php
--- lib/db/postgres7.php 8 Aug 2006 05:13:12 -0000 1.195
+++ lib/db/postgres7.php 9 Aug 2006 10:09:14 -0000
@@ -1635,26 +1635,26 @@
modify_database('', "CREATE TABLE prefix_role_assignments (
id SERIAL PRIMARY KEY,
- roleid interger NOT NULL default 0,
- contextid interger NOT NULL default 0,
- userid interger NOT NULL default 0,
- hidden interger NOT NULL default 0,
- timestart interger NOT NULL default 0,
- timeend interger NOT NULL default 0,
- timemodified interger NOT NULL default 0,
- modifierid interger NOT NULL default 0,
+ roleid integer NOT NULL default 0,
+ contextid integer NOT NULL default 0,
+ userid integer NOT NULL default 0,
+ hidden integer NOT NULL default 0,
+ timestart integer NOT NULL default 0,
+ timeend integer NOT NULL default 0,
+ timemodified integer NOT NULL default 0,
+ modifierid integer NOT NULL default 0,
enrol varchar(20) NOT NULL default '',
sortorder integer NOT NULL default '0'
);");
modify_database('', "CREATE TABLE prefix_role_capabilities (
id SERIAL PRIMARY KEY,
- contextid interger NOT NULL default 0,
- roleid interger NOT NULL default 0,
+ contextid integer NOT NULL default 0,
+ roleid integer NOT NULL default 0,
capability varchar(255) NOT NULL default '',
permission integer NOT NULL default 0,
- timemodified interger NOT NULL default 0,
- modifierid interger NOT NULL default 0
+ timemodified integer NOT NULL default 0,
+ modifierid integer NOT NULL default 0
);");
modify_database('', "CREATE TABLE prefix_role_deny_grant (
Index: accesslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v
retrieving revision 1.4
diff -u -r1.4 accesslib.php
--- accesslib.php 9 Aug 2006 05:37:31 -0000 1.4
+++ accesslib.php 9 Aug 2006 11:06:07 -0000
@@ -354,7 +354,7 @@
$siteinstance = get_context_instance(CONTEXT_SYSTEM, SITEID);
- $SQL = " SELECT rc.capability, c1.id, (c1.level * 100) AS level,
+ $SQL = " SELECT rc.capability, c1.id, (c1.level * 100) AS aggregatelevel,
SUM(rc.permission) AS sum
FROM
{$CFG->prefix}role_assignments AS ra
@@ -366,12 +366,12 @@
rc.contextid=$siteinstance->id
$capsearch
GROUP BY
- rc.capability,level,c1.id
+ rc.capability,aggregatelevel,c1.id
HAVING
- sum != 0
+ SUM(rc.permission) != 0
UNION
- SELECT rc.capability, c1.id, (c1.level * 100 + c2.level) AS level,
+ SELECT rc.capability, c1.id, (c1.level * 100 + c2.level) AS aggregatelevel,
SUM(rc.permission) AS sum
FROM
{$CFG->prefix}role_assignments AS ra
@@ -385,11 +385,11 @@
$capsearch
GROUP BY
- rc.capability, level, c1.id
+ rc.capability, aggregatelevel, c1.id
HAVING
- sum != 0
+ SUM(rc.permission) != 0
ORDER BY
- level ASC
+ aggregatelevel ASC
";
// echo "$SQL"; // debug
@@ -411,31 +411,31 @@
}
/* so up to this point we should have somethign like this
- * $capabilities[1] ->level = 1000
+ * $capabilities[1] ->aggregatelevel = 1000
->module = SITEID
->capability = do_anything
->id = 1 (id is the context id)
->sum = 0
- * $capabilities[2] ->level = 1000
+ * $capabilities[2] ->aggregatelevel = 1000
->module = SITEID
->capability = post_messages
->id = 1
->sum = -9000
- * $capabilittes[3] ->level = 3000
+ * $capabilittes[3] ->aggregatelevel = 3000
->module = course
->capability = view_course_activities
->id = 25
->sum = 1
- * $capabilittes[4] ->level = 3000
+ * $capabilittes[4] ->aggregatelevel = 3000
->module = course
->capability = view_course_activities
->id = 26
->sum = 0 (this is another course)
- * $capabilities[5] ->level = 3050
+ * $capabilities[5] ->aggregatelevel = 3050
->module = course
->capability = view_course_activities
->id = 25 (override in course 25)
@@ -459,7 +459,7 @@
$usercap = array(); // for other user's capabilities
foreach ($capabilities as $capability) {
- if ($otheruserid) { // we are pulling out other user's capabilities, do not write to session
+ if (!empty($otheruserid)) { // we are pulling out other user's capabilities, do not write to session
if (capability_prohibits($capability->capability, $capability->id, $capability->sum, $usercap)) {
$usercap[$capability->id][$capability->capability] = -9000;
@@ -489,7 +489,7 @@
// now we don't care about the huge array anymore, we can dispose it.
unset($capabilities);
- if ($otheruseid) {
+ if (!empty($otheruseid)) {
return $usercap; // return the array
}
// see array in session to see what it looks like
@@ -550,7 +550,7 @@
case CONTEXT_COURSECAT:
// Coursecat -> coursecat or site.
$coursecat = get_record('course_categories','id',$context->instanceid);
- if ($coursecat->parent) {
+ if (!empty($coursecat->parent)) {
// return parent value if exist.
$parent = get_context_instance(CONTEXT_COURSECAT, $coursecat->parent);
} else {
