MDL-17942 fixed some incorrect uses of exceptions and typos

diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index b4de6f2b67f5aad3ddfb7ea4bb8d844475f21b6b..8a9b6090e01d0ea8502326123c69bd15fab86c29 100644 (file)
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -590,15 +590,11 @@ class define_role_table_advanced extends capability_table_with_risks {
             } else {
                 $legacycap = '';
             }
-            if (!$this->role->id = create_role($this->role->name, $this->role->shortname, $this->role->description, $legacycap)) {
-                throw new moodle_exception('errorcreatingrole');
-            }
+            $this->role->id = create_role($this->role->name, $this->role->shortname, $this->role->description, $legacycap);
             $this->roleid = $this->role->id; // Needed to make the parent::save_changes(); call work.
         } else {
             // Updating role
-            if (!$DB->update_record('role', $this->role)) {
-                 throw new moodle_exception('cannotupdaterole');
-            }
+            $DB->update_record('role', $this->role);
 
             // Legacy type
             foreach($this->legacyroles as $type => $cap) {

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0f9bfaeda21a7c3ce0da5774546a52a3d1ad9af8..11fb043adf05e649b09be7cca9dbfcd8eefdbc7c 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2594,15 +2594,13 @@ function get_local_override($roleid, $contextid, $capability) {
  * @param shortname - role short name
  * @param description - role description
  * @param legacy - optional legacy capability
- * @return id or false
+ * @return id or dml_exception
  */
 function create_role($name, $shortname, $description, $legacy='') {
     global $DB;
 
     // Get the system context.
-    if (!$context = get_context_instance(CONTEXT_SYSTEM)) {
-        return false;
-    }
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     // Insert the role record.
     $role = new object();
@@ -4562,16 +4560,12 @@ function get_default_contextlevels($roletype) {
  */
 function set_role_contextlevels($roleid, array $contextlevels) {
     global $DB;
-    if (!$DB->delete_records('role_context_levels', array('roleid' => $roleid))) {
-        throw new moodle_exception('couldnotdeleterolecontextlevels', '', '', $roleid);
-    }
+    $DB->delete_records('role_context_levels', array('roleid' => $roleid));
     $rcl = new stdClass;
     $rcl->roleid = $roleid;
     foreach ($contextlevels as $level) {
         $rcl->contextlevel = $level;
-        if (!$DB->insert_record('role_context_levels', $rcl, false, true)) {
-            throw new moodle_exception('couldnotdeleterolecontextlevels', '', '', $rcl);
-        }
+        $DB->insert_record('role_context_levels', $rcl, false, true);
     }
 }
 

diff --git a/lib/db/install.php b/lib/db/install.php
index 0b1bb7c88562d0a6c1724ae5138a59b5e50d688d..e34b938a7a1d405bacca183dc5c07ae45a16018e 100644 (file)
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -9,7 +9,7 @@ function xmldb_main_install() {
 /// make sure system context exists
     $syscontext = get_context_instance(CONTEXT_SYSTEM);
     if ($syscontext->id != 1) {
-        throw new moodle_exception('generalexceptionmessafe', 'error', '', 'Unexpected system context id created!');
+        throw new moodle_exception('generalexceptionmessage', 'error', '', 'Unexpected system context id created!');
     }
 
 
@@ -31,7 +31,7 @@ function xmldb_main_install() {
     $DB->insert_record('course', $newsite);
     $SITE = get_site();
     if ($SITE->id != 1) {
-        throw new moodle_exception('generalexceptionmessafe', 'error', '', 'Unexpected site course id created!');
+        throw new moodle_exception('generalexceptionmessage', 'error', '', 'Unexpected site course id created!');
     }