]> git.mjollnir.org Git - moodle.git/log
moodle.git
18 years agoBetter approach. Use higher level MetaIndexes() and avoid some MySQL warnings. MDL...
stronk7 [Mon, 9 Apr 2007 00:11:22 +0000 (00:11 +0000)]
Better approach. Use higher level MetaIndexes() and avoid some MySQL warnings. MDL-9256

Merged from MOODLE_18_STABLE

18 years agoNow MySQL looks for existing index names. MDL-9256
stronk7 [Sun, 8 Apr 2007 22:59:54 +0000 (22:59 +0000)]
Now MySQL looks for existing index names. MDL-9256

Merged from MOODLE_18_STABLE

18 years agoMerging in fixes for MDL-8414 and MDL-9250 from MOODLE_18_STABLE
mark-nielsen [Sun, 8 Apr 2007 21:02:16 +0000 (21:02 +0000)]
Merging in fixes for MDL-8414 and MDL-9250 from MOODLE_18_STABLE

18 years agoMerging the removal of the "wtf"
mark-nielsen [Sat, 7 Apr 2007 19:23:13 +0000 (19:23 +0000)]
Merging the removal of the "wtf"

18 years agoImplements MDL-8808
mudrd8mz [Sat, 7 Apr 2007 19:06:06 +0000 (19:06 +0000)]
Implements MDL-8808

Now we can go to a missing docs/help files directly via a link. Thanks to Mitsuhiro Yoshida for the patch.

18 years agoMerged fixes from MOODLE_18_STABLE (from 1.88.2.3 to 1.88.2.4)
mudrd8mz [Sat, 7 Apr 2007 18:38:04 +0000 (18:38 +0000)]
Merged fixes from MOODLE_18_STABLE (from 1.88.2.3 to 1.88.2.4)

18 years agoMerged an fix from MOODLE_18_STABLE: Fixed and error in rendering different backgroun...
mudrd8mz [Sat, 7 Apr 2007 16:21:15 +0000 (16:21 +0000)]
Merged an fix from MOODLE_18_STABLE: Fixed and error in rendering different background color of the row in non-editable environment.

18 years agoNow $CFG->apachemaxmem is respected.
stronk7 [Sat, 7 Apr 2007 16:08:51 +0000 (16:08 +0000)]
Now $CFG->apachemaxmem is respected.

Merged from MOODLE_18_STABLE

18 years agoMDL-8429 Upgrade ADOdb to 4.9.4
skodak [Sat, 7 Apr 2007 08:30:19 +0000 (08:30 +0000)]
MDL-8429 Upgrade ADOdb to 4.9.4

18 years agoMDL-9181 Use new password field with reveal option in editadvanced and enrolment...
skodak [Fri, 6 Apr 2007 16:23:48 +0000 (16:23 +0000)]
MDL-9181 Use new password field with reveal option in editadvanced and enrolment, group and quiz keys

18 years agoMDL-9239 New fromslib password element with reveal option; merged from MOODLE_18_STABLE
skodak [Fri, 6 Apr 2007 14:18:02 +0000 (14:18 +0000)]
MDL-9239 New fromslib password element with reveal option; merged from MOODLE_18_STABLE

18 years agoMDL-9227 Inconsistent HTTPS for profile edit page; merged from MOODLE_17_STABLE
skodak [Fri, 6 Apr 2007 07:51:18 +0000 (07:51 +0000)]
MDL-9227  Inconsistent HTTPS for profile edit page; merged from MOODLE_17_STABLE

18 years agosee MDL-8886.
jamiesensei [Fri, 6 Apr 2007 06:01:11 +0000 (06:01 +0000)]
see MDL-8886.

fixes bug that meant :

       $mform->disabledIf('studentfeedbackurl', 'studentfeedback', 'eq', 0);
       $mform->disabledIf('studentfeedbackurl', 'studentfeedback', 'eq', 3);
       $mform->disabledIf('studentfeedbackurl', 'studentfeedback', 'eq', 4);

didn't work.

18 years agoFixing authdb->close() in some places. Credir goes to Seiti. MDL-9212
stronk7 [Thu, 5 Apr 2007 22:22:28 +0000 (22:22 +0000)]
Fixing authdb->close() in some places. Credir goes to Seiti. MDL-9212

Merged from MOODLE_18_STABLE

18 years agoMDL-9224 - Score sometimes relealed, even when the quiz settings say it should not...
tjhunt [Thu, 5 Apr 2007 13:54:20 +0000 (13:54 +0000)]
MDL-9224 - Score sometimes relealed, even when the quiz settings say it should not be. Merged from OU Moodle.

18 years agoFixes bug MDL-9221 "new group admin - can't view full group name".
nfreear [Thu, 5 Apr 2007 10:55:04 +0000 (10:55 +0000)]
Fixes bug MDL-9221 "new group admin - can't view full group name".

18 years agoFixes bug MDL-9221 "new group admin - can't view full group name". Merged
nfreear [Thu, 5 Apr 2007 10:40:55 +0000 (10:40 +0000)]
Fixes bug MDL-9221 "new group admin - can't view full group name". Merged

18 years agoMDL-9219 Replace Inherit with Not set on role definition page; merged from MOODLE_18_...
skodak [Thu, 5 Apr 2007 09:17:50 +0000 (09:17 +0000)]
MDL-9219 Replace Inherit with Not set on role definition page; merged from MOODLE_18_STABLE

18 years agoMDL-9218 Processing of role assignments produces PHP notices; merged from MOODLE_18_S...
skodak [Thu, 5 Apr 2007 08:43:06 +0000 (08:43 +0000)]
MDL-9218 Processing of role assignments produces PHP notices; merged from MOODLE_18_STABLE

18 years agofix for MDL-9186, capability fix for calendar
toyomoyo [Thu, 5 Apr 2007 07:58:31 +0000 (07:58 +0000)]
fix for MDL-9186, capability fix for calendar

18 years agoMDL-8537 Added $CFG as the object to check for enrol method when the course is being...
nicolasconnault [Thu, 5 Apr 2007 07:58:15 +0000 (07:58 +0000)]
MDL-8537 Added $CFG as the object to check for enrol method when the course is being created.

18 years agomerged fix for MDL-9165
toyomoyo [Thu, 5 Apr 2007 06:00:10 +0000 (06:00 +0000)]
merged fix for MDL-9165

18 years agoMDL-9198: Embedded PDF now works fine in FF 1.5, FF 2, IE5, IE6, IE7 and Opera, and...
nicolasconnault [Thu, 5 Apr 2007 05:51:12 +0000 (05:51 +0000)]
MDL-9198: Embedded PDF now works fine in FF 1.5, FF 2, IE5, IE6, IE7 and Opera, and degrades beautifully in non-supported browsers (or when plugin is missing).

18 years agolib/setup moodelib: Introducing moodle_request_shutdown()
martinlanghoff [Thu, 5 Apr 2007 05:04:06 +0000 (05:04 +0000)]
lib/setup moodelib: Introducing moodle_request_shutdown()

Now Moodle will have a 'shutdown_function' function. Right now
registered (and useful) only when running under apache + mod_php.

This initial function checks whether memory usage in this process exceeded
10MiB or $CFG->apachemaxmem (int, in bytes). This is really useful to prevent
using more RAM than we have.

18 years agofix for MDL-9197. multilang filter is not applied to default role in course settings
toyomoyo [Thu, 5 Apr 2007 03:56:50 +0000 (03:56 +0000)]
fix for MDL-9197. multilang filter is not applied to default role in course settings

18 years agoFinally fixed XHTML error on this page.
nicolasconnault [Thu, 5 Apr 2007 03:37:12 +0000 (03:37 +0000)]
Finally fixed XHTML error on this page.

18 years agoAutomatic installer.php lang files by installer_builder (20070405)
moodler [Thu, 5 Apr 2007 03:29:25 +0000 (03:29 +0000)]
Automatic installer.php lang files by installer_builder (20070405)

18 years agoMDL-9204 New submission wasn't given a timemodified upon creation.
nicolasconnault [Thu, 5 Apr 2007 03:19:58 +0000 (03:19 +0000)]
MDL-9204 New submission wasn't given a timemodified upon creation.

18 years agoFixed broken XHTML
nicolasconnault [Thu, 5 Apr 2007 02:12:28 +0000 (02:12 +0000)]
Fixed broken XHTML

18 years agoMDL-9207 Changed $extcourse to $coursefield in lines 92 to 111
nicolasconnault [Thu, 5 Apr 2007 01:54:44 +0000 (01:54 +0000)]
MDL-9207 Changed $extcourse to $coursefield in lines 92 to 111

18 years agoMDL-9090
nicolasconnault [Thu, 5 Apr 2007 01:44:54 +0000 (01:44 +0000)]
MDL-9090

18 years agoMDL-8802 fixed byteserving broken by adobe anti xss patch; merged from MOODLE_18_STABLE
skodak [Wed, 4 Apr 2007 19:45:17 +0000 (19:45 +0000)]
MDL-8802 fixed byteserving broken by adobe anti xss patch; merged from MOODLE_18_STABLE

18 years agoMDL-9208 - Only hightlight the correct answer if that option is set.
tjhunt [Wed, 4 Apr 2007 18:01:36 +0000 (18:01 +0000)]
MDL-9208 - Only hightlight the correct answer if that option is set.

18 years agoBug 2951 - correct PARAM_ types for answers to multichoice and shortanswer questions...
tjhunt [Wed, 4 Apr 2007 16:51:10 +0000 (16:51 +0000)]
Bug 2951 - correct PARAM_ types for answers to multichoice and shortanswer questions. Merged from OU Moodle.

18 years agoMDL-9183 - yet another invisiblefieldset causing layout problems. Merged from MOODLE_...
tjhunt [Wed, 4 Apr 2007 15:30:41 +0000 (15:30 +0000)]
MDL-9183 - yet another invisiblefieldset causing layout problems. Merged from MOODLE_18_STABLE.

18 years agoDB UPGRADE for SCORM 2004
csantossaenz [Wed, 4 Apr 2007 12:34:22 +0000 (12:34 +0000)]
DB UPGRADE for SCORM 2004

18 years agofixes MDL-9195 mform->hardFreeze() doesn't remove id attribute of label for checkbox
jamiesensei [Wed, 4 Apr 2007 10:16:22 +0000 (10:16 +0000)]
fixes MDL-9195 mform->hardFreeze() doesn't remove id attribute of label for checkbox

18 years ago MDL-9191 fix for potential incorrect use of get_auth_plugin; merged from MOODLE_18_S...
skodak [Wed, 4 Apr 2007 09:19:31 +0000 (09:19 +0000)]
 MDL-9191 fix for potential incorrect use of get_auth_plugin; merged from MOODLE_18_STABLE

18 years agofix for MDL-9095, increase blog tag length
toyomoyo [Wed, 4 Apr 2007 09:13:32 +0000 (09:13 +0000)]
fix for MDL-9095, increase blog tag length

18 years agoMerged MDL-6553 from 1.8 stable
moodler [Wed, 4 Apr 2007 07:24:14 +0000 (07:24 +0000)]
Merged MDL-6553 from 1.8 stable

18 years agoMDL-9124 Added a visual notification when group membership doesn't allow adding discu...
nicolasconnault [Wed, 4 Apr 2007 06:27:50 +0000 (06:27 +0000)]
MDL-9124 Added a visual notification when group membership doesn't allow adding discussions.

18 years agoAdded rows and cols to menu options textarea, fixing xhtml break.
nicolasconnault [Wed, 4 Apr 2007 04:39:23 +0000 (04:39 +0000)]
Added rows and cols to menu options textarea, fixing xhtml break.

18 years agoMDL-9144
nicolasconnault [Wed, 4 Apr 2007 04:31:22 +0000 (04:31 +0000)]
MDL-9144

18 years agoMDL-9135
nicolasconnault [Wed, 4 Apr 2007 04:22:16 +0000 (04:22 +0000)]
MDL-9135

18 years agoMDL-9136: Added a $selected attribute to the profile_field_menu object, which gets...
nicolasconnault [Wed, 4 Apr 2007 04:09:47 +0000 (04:09 +0000)]
MDL-9136: Added a $selected attribute to the profile_field_menu object, which gets set during initialisation.

18 years agomerged fix for MDL-9185
toyomoyo [Wed, 4 Apr 2007 04:05:53 +0000 (04:05 +0000)]
merged fix for MDL-9185

18 years agoAutomatic installer.php lang files by installer_builder (20070404)
moodler [Wed, 4 Apr 2007 03:54:08 +0000 (03:54 +0000)]
Automatic installer.php lang files by installer_builder (20070404)

18 years agoMDL-9138; Edited lib/xmlize.php to return false when the passed file doesn't return...
nicolasconnault [Wed, 4 Apr 2007 03:35:23 +0000 (03:35 +0000)]
MDL-9138; Edited lib/xmlize.php to return false when the passed file doesn't return any entries (when it's not valid XML or is empty). Also made it much clearer that glossary/import requires an XML file, not just any old file.

18 years agoMDL-9192
nicolasconnault [Wed, 4 Apr 2007 02:40:21 +0000 (02:40 +0000)]
MDL-9192

18 years agoMDL-9193
nicolasconnault [Wed, 4 Apr 2007 02:22:34 +0000 (02:22 +0000)]
MDL-9193

18 years agoMDL-9145 Fixed 1) and 2)
nicolasconnault [Wed, 4 Apr 2007 01:43:31 +0000 (01:43 +0000)]
MDL-9145 Fixed 1) and 2)

18 years agoShow continue button after importing glossary. MDL-9071
stronk7 [Tue, 3 Apr 2007 15:44:17 +0000 (15:44 +0000)]
Show continue button after importing glossary. MDL-9071

Merged from MOODLE_18_STABLE

18 years agoMDL-9170 https redirect doesn't happen on login page - fixed problem when guest...
skodak [Tue, 3 Apr 2007 14:59:56 +0000 (14:59 +0000)]
MDL-9170  https redirect doesn't happen on login page - fixed problem when guest button disabled; merged from MOODLE_18_STABLE

18 years agoFixes bug MDL-9175 "Groups simpletest, fatal errors", also DONOTCOMMIT. Merged.
nfreear [Tue, 3 Apr 2007 10:21:38 +0000 (10:21 +0000)]
Fixes bug MDL-9175 "Groups simpletest, fatal errors", also DONOTCOMMIT. Merged.

18 years agoFixes bug MDL-9175 "Groups simpletest, fatal errors", also DONOTCOMMIT.
nfreear [Tue, 3 Apr 2007 10:16:51 +0000 (10:16 +0000)]
Fixes bug MDL-9175 "Groups simpletest, fatal errors", also DONOTCOMMIT.

18 years agoMDL-9190 Site policy xhtml compliance and other minor fixes; merged from MOODLE_18_STABLE
skodak [Tue, 3 Apr 2007 09:51:53 +0000 (09:51 +0000)]
MDL-9190 Site policy xhtml compliance and other minor fixes; merged from MOODLE_18_STABLE

18 years agofix for MDL-8739, restore in course category
toyomoyo [Tue, 3 Apr 2007 09:19:09 +0000 (09:19 +0000)]
fix for MDL-8739, restore in course category

18 years agoMDL-9147
nicolasconnault [Tue, 3 Apr 2007 08:43:30 +0000 (08:43 +0000)]
MDL-9147

18 years agoBetter way to detect whether a function exists in this version of PHP before redefini...
tjhunt [Tue, 3 Apr 2007 08:34:39 +0000 (08:34 +0000)]
Better way to detect whether a function exists in this version of PHP before redefining it.

18 years agoMDL-9167 and MDL-9113 both solved
nicolasconnault [Tue, 3 Apr 2007 06:41:58 +0000 (06:41 +0000)]
MDL-9167 and MDL-9113 both solved

18 years agoMDL-8774: Also an effort to refactorise the poorly designed mod/data/Preset code.
nicolasconnault [Tue, 3 Apr 2007 03:32:46 +0000 (03:32 +0000)]
MDL-8774: Also an effort to refactorise the poorly designed mod/data/Preset code.

18 years agoMerged some more fixes for checkbox alignment MDL-9126 in all browsers
moodler [Tue, 3 Apr 2007 02:21:28 +0000 (02:21 +0000)]
Merged some more fixes for checkbox alignment MDL-9126 in all browsers

18 years agoMerged ie6 fixes from stable for MDL-9126
moodler [Tue, 3 Apr 2007 02:14:09 +0000 (02:14 +0000)]
Merged ie6 fixes from stable for MDL-9126

18 years agoMerged login box fix for MDL-9126
moodler [Tue, 3 Apr 2007 02:01:10 +0000 (02:01 +0000)]
Merged login box fix for MDL-9126

18 years agoFixed one wrong urlencode after error.
stronk7 [Mon, 2 Apr 2007 22:03:03 +0000 (22:03 +0000)]
Fixed one wrong urlencode after error.

Merged from MOODLE_18_STABLE

18 years agoDisable the "save" button if the file isn't writable.
stronk7 [Mon, 2 Apr 2007 21:51:16 +0000 (21:51 +0000)]
Disable the "save" button if the file isn't writable.

Merged from MOODLE_18_STABLE

18 years agoCentering buttons in some actions...
stronk7 [Mon, 2 Apr 2007 21:37:28 +0000 (21:37 +0000)]
Centering buttons in some actions...

Merged from MOODLE_18_STABLE

18 years agoMDL-9180 Change password screen doesn't show the username like it should; merged...
skodak [Mon, 2 Apr 2007 18:03:13 +0000 (18:03 +0000)]
MDL-9180 Change password screen doesn't show the username like it should; merged from MOODLE_18_STABLE

18 years agoMDL-9168 nested site policy when forcelogin enabled; merged from MOODLE_18_STABLE
skodak [Mon, 2 Apr 2007 16:13:41 +0000 (16:13 +0000)]
MDL-9168 nested site policy when forcelogin enabled; merged from MOODLE_18_STABLE

18 years agoMake sure print_object output is always left-aligned. Also, make it look more like...
tjhunt [Mon, 2 Apr 2007 15:28:43 +0000 (15:28 +0000)]
Make sure print_object output is always left-aligned. Also, make it look more like other debugging output.

18 years agoMissing format_string. Merged from MOODLE_18_STABLE.
tjhunt [Mon, 2 Apr 2007 15:26:31 +0000 (15:26 +0000)]
Missing format_string. Merged from MOODLE_18_STABLE.

18 years agoMDL-9174 do not use PARAM_URL for site policy - it is too restrictive; merged from...
skodak [Mon, 2 Apr 2007 15:14:19 +0000 (15:14 +0000)]
MDL-9174 do not use PARAM_URL for site policy - it is too restrictive; merged from MOODLE_18_STABLE

18 years agofixed warning when upload fails; merged from MOODLE_18_STABLE
skodak [Mon, 2 Apr 2007 14:57:56 +0000 (14:57 +0000)]
fixed warning when upload fails; merged from MOODLE_18_STABLE

18 years agoMerged username login form bug fix from stable
exe-cutor [Mon, 2 Apr 2007 14:13:59 +0000 (14:13 +0000)]
Merged username login form bug fix from stable

18 years agoMDL-9170 https redirect doesn't happen on login page; merged from MOODLE_18_STABLE
skodak [Mon, 2 Apr 2007 13:59:36 +0000 (13:59 +0000)]
MDL-9170 https redirect doesn't happen on login page; merged from MOODLE_18_STABLE

18 years agoMDL-9172 "Turn editing off" button disappear from category page; merged from MOODLE_1...
skodak [Mon, 2 Apr 2007 13:46:01 +0000 (13:46 +0000)]
MDL-9172 "Turn editing off" button disappear from category page; merged from MOODLE_18_STABLE

18 years agoMDL-9169 Error in function call in ldap/enrol.php; typo found by Svante Agnestig...
skodak [Mon, 2 Apr 2007 13:16:55 +0000 (13:16 +0000)]
MDL-9169 Error in function call in ldap/enrol.php; typo found by Svante Agnestig; merged from MOODLE_18_STABLE

18 years agoMDL-9173 - Can't create match anything answer to numerical question type. Merged...
tjhunt [Mon, 2 Apr 2007 13:02:09 +0000 (13:02 +0000)]
MDL-9173 - Can't create match anything answer to numerical question type. Merged from OU Moodle.

18 years agoMDL-9166 auth plugins can prevent showing of last logged in user; merged from MOODLE_...
skodak [Mon, 2 Apr 2007 09:26:07 +0000 (09:26 +0000)]
MDL-9166 auth plugins can prevent showing of last logged in user; merged from MOODLE_18_STABLE

18 years agoMDL-9155 Error when creating an "image gallery" preset database when only some fields...
skodak [Mon, 2 Apr 2007 09:10:26 +0000 (09:10 +0000)]
MDL-9155 Error when creating an "image gallery" preset database when only some fields exist and do not remove existing data, comments and ratings when applying preset; merged from MOODLE_18_STABLE

18 years agoI felt like a bump. So nyah.
moodler [Mon, 2 Apr 2007 06:21:01 +0000 (06:21 +0000)]
I felt like a bump.  So nyah.

18 years agomerged fix for MDL-9160, get_my_courses caching issues
toyomoyo [Mon, 2 Apr 2007 03:53:10 +0000 (03:53 +0000)]
merged fix for MDL-9160, get_my_courses caching issues

18 years agoadmins should not need course:view
toyomoyo [Mon, 2 Apr 2007 02:37:34 +0000 (02:37 +0000)]
admins should not need course:view

18 years agoMNET: Properly remove trailing slash from wwwroot: MDL-9157
donal72 [Mon, 2 Apr 2007 01:45:33 +0000 (01:45 +0000)]
MNET: Properly remove trailing slash from wwwroot: MDL-9157

18 years agoAnother attempt to get redirect() to not redirect if an error was output to the scree...
tjhunt [Sun, 1 Apr 2007 22:19:39 +0000 (22:19 +0000)]
Another attempt to get redirect() to not redirect if an error was output to the screen, to make dubuggin easier. Sorry I had not noticed the bit in the docs that says error_get_last was PHP 5.2.0+.

18 years agoMerged MDL-9139 from 1.8
moodler [Sun, 1 Apr 2007 15:59:04 +0000 (15:59 +0000)]
Merged MDL-9139 from 1.8

18 years agoMerged editsection button alignment from stable
moodler [Sun, 1 Apr 2007 15:18:06 +0000 (15:18 +0000)]
Merged editsection button alignment from stable

18 years agomerged style fix for required message on forms
moodler [Sat, 31 Mar 2007 09:10:41 +0000 (09:10 +0000)]
merged style fix for required message on forms

18 years agoMerged solution for MDL-6458 typo
moodler [Sat, 31 Mar 2007 05:25:41 +0000 (05:25 +0000)]
Merged solution for MDL-6458 typo

18 years agoMaking redirects work again
moodler [Sat, 31 Mar 2007 02:34:06 +0000 (02:34 +0000)]
Making redirects work again

18 years agoerror_get_last() ? What's that?
moodler [Sat, 31 Mar 2007 02:30:56 +0000 (02:30 +0000)]
error_get_last() ?   What's that?

18 years agomerging changes from MOODLE_18_STABLE
skodak [Fri, 30 Mar 2007 21:23:09 +0000 (21:23 +0000)]
merging changes from MOODLE_18_STABLE

18 years agoAdded patch from Mark for MDL-9083; merged from MOODLE_18_STABLE
skodak [Fri, 30 Mar 2007 21:15:39 +0000 (21:15 +0000)]
Added patch from Mark for MDL-9083; merged from MOODLE_18_STABLE

18 years agomerging string from MOODLE_18_STABLE
skodak [Fri, 30 Mar 2007 21:11:45 +0000 (21:11 +0000)]
merging string from MOODLE_18_STABLE

18 years agoMore multilang support for site fullname, plus a couple extra comments. merged from...
skodak [Fri, 30 Mar 2007 21:10:15 +0000 (21:10 +0000)]
More multilang support for site fullname, plus a couple extra comments. merged from MOODLE_18_STABLE

18 years agoMore multilang support for site fullname, plus a couple extra comments; merged from...
skodak [Fri, 30 Mar 2007 21:07:30 +0000 (21:07 +0000)]
More multilang support for site fullname, plus a couple extra comments; merged from MOODLE_18_STABLE.

18 years agoMerged block self-test fix from stable
moodler [Fri, 30 Mar 2007 18:04:34 +0000 (18:04 +0000)]
Merged block self-test fix from stable

18 years agoFixed typo (MDL-9119)
moodler [Fri, 30 Mar 2007 17:07:12 +0000 (17:07 +0000)]
Fixed typo (MDL-9119)

18 years agoMerged applicable_format fixes for MDL-9119
moodler [Fri, 30 Mar 2007 16:52:38 +0000 (16:52 +0000)]
Merged applicable_format fixes for MDL-9119

18 years agoMerged fix for MDL-8093 from 1.8
moodler [Fri, 30 Mar 2007 16:01:44 +0000 (16:01 +0000)]
Merged fix for MDL-8093 from 1.8