Merge branch 'wip-MDL-36670-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

2014-05-14 16:36:52 +08:00
parent c6a4cac799 ad9124d045
commit b91be533d1
1 changed files with 5 additions and 0 deletions
@@ -1607,6 +1607,11 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
    // database so that it doesn't cause a DB error. Log a warning so that
    // developers can avoid doing things which are likely to cause this on a
    // routine basis.
+    if (textlib::strlen($action) > 40) {
+        $action = textlib::substr($action, 0, 37) . '...';
+        debugging('Warning: logged very long action', DEBUG_DEVELOPER);
+    }
+
    if(!empty($info) && textlib::strlen($info)>255) {
        $info = textlib::substr($info,0,252).'...';
        debugging('Warning: logged very long info',DEBUG_DEVELOPER);