Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of git://github.com/moodle/moodle into master_M…

…DL-30576
  • Loading branch information...
commit 7ec0b1a936eb29dc9d693ef618b28bd0457dc3cb 2 parents b5a26fe + f89a83b
Mayank Gupta mayankgupta authored

Showing 473 changed files with 630 additions and 303 deletions. Show diff stats Hide diff stats

  1. +12 1 admin/lib.php
  2. +21 0 admin/roles/admins.php
  3. +23 5 admin/roles/lib.php
  4. +1 0  admin/settings/security.php
  5. +2 1  admin/tool/customlang/db/upgrade.php
  6. +3 0  auth/manual/db/upgrade.php
  7. +3 0  auth/mnet/db/upgrade.php
  8. +3 0  blocks/community/db/upgrade.php
  9. +57 20 blocks/edit_form.php
  10. +3 0  blocks/html/db/upgrade.php
  11. +6 1 blocks/login/block_login.php
  12. +3 0  blocks/navigation/db/upgrade.php
  13. +3 0  blocks/settings/db/upgrade.php
  14. +30 0 course/format/scorm/version.php
  15. +30 0 course/format/social/version.php
  16. +30 0 course/format/topics/version.php
  17. +30 0 course/format/weeks/version.php
  18. +3 0  enrol/authorize/db/upgrade.php
  19. +3 0  enrol/database/db/upgrade.php
  20. +1 1  enrol/database/lib.php
  21. +2 0  enrol/flatfile/db/upgrade.php
  22. +46 0 enrol/guest/db/upgrade.php
  23. +16 0 enrol/guest/lib.php
  24. +1 1  enrol/guest/version.php
  25. +3 0  enrol/imsenterprise/db/upgrade.php
  26. +4 0 enrol/imsenterprise/lib.php
  27. +3 0  enrol/mnet/db/upgrade.php
  28. +3 0  enrol/paypal/db/upgrade.php
  29. 0  filter/emailprotect/{vesion.php → version.php}
  30. +3 0  filter/mediaplugin/db/upgrade.php
  31. +3 0  filter/tex/db/upgrade.php
  32. +3 0  grade/grading/form/rubric/db/upgrade.php
  33. +1 1  grade/report/user/index.php
  34. +1 1  index.php
  35. +1 1  install/lang/af/admin.php
  36. +1 1  install/lang/af/langconfig.php
  37. +1 1  install/lang/am/install.php
  38. +1 1  install/lang/am/langconfig.php
  39. +1 1  install/lang/am/moodle.php
  40. +1 1  install/lang/ar/admin.php
  41. +1 1  install/lang/ar/error.php
  42. +1 1  install/lang/ar/install.php
  43. +1 1  install/lang/ar/langconfig.php
  44. +1 1  install/lang/ar/moodle.php
  45. +1 1  install/lang/ast/admin.php
  46. +1 1  install/lang/ast/error.php
  47. +1 1  install/lang/ast/install.php
  48. +1 1  install/lang/ast/langconfig.php
  49. +1 1  install/lang/ast/moodle.php
  50. +1 1  install/lang/az/admin.php
  51. +1 1  install/lang/az/error.php
  52. +1 1  install/lang/az/install.php
  53. +1 1  install/lang/az/langconfig.php
  54. +1 1  install/lang/be/langconfig.php
  55. +1 1  install/lang/be/moodle.php
  56. +1 1  install/lang/bg/admin.php
  57. +1 1  install/lang/bg/error.php
  58. +1 1  install/lang/bg/install.php
  59. +1 1  install/lang/bg/langconfig.php
  60. +1 1  install/lang/bg/moodle.php
  61. +1 1  install/lang/bn/admin.php
  62. +1 1  install/lang/bn/install.php
  63. +1 1  install/lang/bn/langconfig.php
  64. +1 1  install/lang/bn/moodle.php
  65. +1 1  install/lang/bs/install.php
  66. +1 1  install/lang/bs/langconfig.php
  67. +1 1  install/lang/ca/admin.php
  68. +1 1  install/lang/ca/error.php
  69. +1 1  install/lang/ca/install.php
  70. +1 1  install/lang/ca/langconfig.php
  71. +1 1  install/lang/ca/moodle.php
  72. +1 1  install/lang/ckb/langconfig.php
  73. +1 1  install/lang/cs/admin.php
  74. +1 1  install/lang/cs/error.php
  75. +3 1 install/lang/cs/install.php
  76. +1 1  install/lang/cs/langconfig.php
  77. +1 1  install/lang/cs/moodle.php
  78. +1 1  install/lang/cy/admin.php
  79. +1 1  install/lang/cy/error.php
  80. +1 1  install/lang/cy/install.php
  81. +1 1  install/lang/cy/langconfig.php
  82. +1 1  install/lang/cy/moodle.php
  83. +1 1  install/lang/da/admin.php
  84. +1 1  install/lang/da/error.php
  85. +2 2 install/lang/da/install.php
  86. +1 1  install/lang/da/langconfig.php
  87. +1 1  install/lang/da/moodle.php
  88. +1 1  install/lang/de/admin.php
  89. +1 1  install/lang/de/error.php
  90. +1 1  install/lang/de/install.php
  91. +1 1  install/lang/de/langconfig.php
  92. +1 1  install/lang/de/moodle.php
  93. +1 1  install/lang/de_du/error.php
  94. +1 1  install/lang/de_du/install.php
  95. +1 1  install/lang/de_du/langconfig.php
  96. +1 1  install/lang/de_kids/langconfig.php
  97. +1 1  install/lang/dv/admin.php
  98. +1 1  install/lang/dv/error.php
  99. +1 1  install/lang/dv/install.php
  100. +1 1  install/lang/dv/langconfig.php
  101. +1 1  install/lang/dv/moodle.php
  102. +1 1  install/lang/el/admin.php
  103. +1 1  install/lang/el/error.php
  104. +1 1  install/lang/el/install.php
  105. +1 1  install/lang/el/langconfig.php
  106. +1 1  install/lang/el/moodle.php
  107. +1 1  install/lang/en/admin.php
  108. +1 1  install/lang/en/error.php
  109. +1 1  install/lang/en/install.php
  110. +1 1  install/lang/en/langconfig.php
  111. +1 1  install/lang/en/moodle.php
  112. +1 1  install/lang/en_us/install.php
  113. +1 1  install/lang/en_us/langconfig.php
  114. +1 1  install/lang/es/admin.php
  115. +1 1  install/lang/es/error.php
  116. +5 4 install/lang/es/install.php
  117. +1 1  install/lang/es/langconfig.php
  118. +1 1  install/lang/es/moodle.php
  119. +1 1  install/lang/es_ar/langconfig.php
  120. +1 1  install/lang/es_es/langconfig.php
  121. +1 1  install/lang/es_mx/langconfig.php
  122. +1 1  install/lang/et/admin.php
  123. +1 1  install/lang/et/error.php
  124. +1 1  install/lang/et/install.php
  125. +1 1  install/lang/et/langconfig.php
  126. +1 1  install/lang/et/moodle.php
  127. +1 1  install/lang/eu/admin.php
  128. +1 1  install/lang/eu/error.php
  129. +1 1  install/lang/eu/install.php
  130. +1 1  install/lang/eu/langconfig.php
  131. +1 1  install/lang/eu/moodle.php
  132. +1 1  install/lang/fa/admin.php
  133. +1 1  install/lang/fa/install.php
  134. +1 1  install/lang/fa/langconfig.php
  135. +1 1  install/lang/fa/moodle.php
  136. +1 1  install/lang/fi/admin.php
  137. +1 1  install/lang/fi/error.php
  138. +1 1  install/lang/fi/install.php
  139. +1 1  install/lang/fi/langconfig.php
  140. +1 1  install/lang/fi/moodle.php
  141. +1 1  install/lang/fil/langconfig.php
  142. +1 1  install/lang/fil/moodle.php
  143. +1 1  install/lang/fj/langconfig.php
  144. +1 1  install/lang/fr/admin.php
  145. +1 1  install/lang/fr/error.php
  146. +1 1  install/lang/fr/install.php
  147. +1 1  install/lang/fr/langconfig.php
  148. +1 1  install/lang/fr/moodle.php
  149. +1 1  install/lang/fr_ca/install.php
  150. +1 1  install/lang/fr_ca/langconfig.php
  151. +1 1  install/lang/fr_ca/moodle.php
  152. +1 1  install/lang/ga/langconfig.php
  153. +1 1  install/lang/gd/langconfig.php
  154. +1 1  install/lang/gl/admin.php
  155. +1 1  install/lang/gl/error.php
  156. +1 1  install/lang/gl/install.php
  157. +1 1  install/lang/gl/langconfig.php
  158. +1 1  install/lang/gl/moodle.php
  159. +1 1  install/lang/gu/error.php
  160. +1 1  install/lang/gu/langconfig.php
  161. +1 1  install/lang/gu/moodle.php
  162. +1 1  install/lang/he/admin.php
  163. +1 1  install/lang/he/error.php
  164. +1 1  install/lang/he/install.php
  165. +1 1  install/lang/he/langconfig.php
  166. +1 1  install/lang/he/moodle.php
  167. +1 1  install/lang/hi/langconfig.php
  168. +1 1  install/lang/hi/moodle.php
  169. +1 1  install/lang/hr/admin.php
  170. +1 1  install/lang/hr/error.php
  171. +1 1  install/lang/hr/install.php
  172. +1 1  install/lang/hr/langconfig.php
  173. +1 1  install/lang/hr/moodle.php
  174. +1 1  install/lang/hu/admin.php
  175. +1 1  install/lang/hu/error.php
  176. +1 1  install/lang/hu/install.php
  177. +1 1  install/lang/hu/langconfig.php
  178. +1 1  install/lang/hu/moodle.php
  179. +1 1  install/lang/hy/admin.php
  180. +1 1  install/lang/hy/error.php
  181. +1 1  install/lang/hy/install.php
  182. +1 1  install/lang/hy/langconfig.php
  183. +1 1  install/lang/hy/moodle.php
  184. +1 1  install/lang/id/langconfig.php
  185. +1 1  install/lang/id/moodle.php
  186. +1 1  install/lang/is/admin.php
  187. +1 1  install/lang/is/error.php
  188. +1 1  install/lang/is/install.php
  189. +1 1  install/lang/is/langconfig.php
  190. +1 1  install/lang/is/moodle.php
  191. +1 1  install/lang/it/admin.php
  192. +1 1  install/lang/it/error.php
  193. +1 1  install/lang/it/install.php
  194. +1 1  install/lang/it/langconfig.php
  195. +1 1  install/lang/it/moodle.php
  196. +1 1  install/lang/ja/admin.php
  197. +1 1  install/lang/ja/error.php
  198. +1 1  install/lang/ja/install.php
  199. +1 1  install/lang/ja/langconfig.php
  200. +1 1  install/lang/ja/moodle.php
  201. +1 1  install/lang/ka/admin.php
  202. +1 1  install/lang/ka/install.php
  203. +1 1  install/lang/ka/langconfig.php
  204. +1 1  install/lang/kk/install.php
  205. +1 1  install/lang/kk/langconfig.php
  206. +1 1  install/lang/kk/moodle.php
  207. +1 1  install/lang/km/admin.php
  208. +1 1  install/lang/km/error.php
  209. +1 1  install/lang/km/install.php
  210. +1 1  install/lang/km/langconfig.php
  211. +1 1  install/lang/km/moodle.php
  212. +1 1  install/lang/kn/langconfig.php
  213. +1 1  install/lang/ko/admin.php
  214. +1 1  install/lang/ko/error.php
  215. +1 1  install/lang/ko/install.php
  216. +1 1  install/lang/ko/langconfig.php
  217. +1 1  install/lang/ko/moodle.php
  218. +1 1  install/lang/la/langconfig.php
  219. +1 1  install/lang/la/moodle.php
  220. +1 1  install/lang/lo/admin.php
  221. +1 1  install/lang/lo/install.php
  222. +1 1  install/lang/lo/langconfig.php
  223. +1 1  install/lang/lo/moodle.php
  224. +1 1  install/lang/lt/langconfig.php
  225. +1 1  install/lang/lt/moodle.php
  226. +1 1  install/lang/lv/admin.php
  227. +1 1  install/lang/lv/error.php
  228. +1 1  install/lang/lv/install.php
  229. +1 1  install/lang/lv/langconfig.php
  230. +1 1  install/lang/lv/moodle.php
  231. +1 1  install/lang/mi_tn/langconfig.php
  232. +1 1  install/lang/mi_tn/moodle.php
  233. +1 1  install/lang/mi_wwow/admin.php
  234. +1 1  install/lang/mi_wwow/error.php
  235. +1 1  install/lang/mi_wwow/install.php
  236. +1 1  install/lang/mi_wwow/langconfig.php
  237. +1 1  install/lang/mi_wwow/moodle.php
  238. +1 1  install/lang/mk/admin.php
  239. +1 1  install/lang/mk/error.php
  240. +1 1  install/lang/mk/install.php
  241. +1 1  install/lang/mk/langconfig.php
  242. +1 1  install/lang/mk/moodle.php
  243. +1 1  install/lang/ml/langconfig.php
  244. +1 1  install/lang/ml/moodle.php
  245. +1 1  install/lang/mn/admin.php
  246. +1 1  install/lang/mn/error.php
  247. +1 1  install/lang/mn/install.php
  248. +1 1  install/lang/mn/langconfig.php
  249. +1 1  install/lang/mn/moodle.php
  250. +1 1  install/lang/mr/admin.php
  251. +1 1  install/lang/mr/error.php
  252. +1 1  install/lang/mr/install.php
  253. +1 1  install/lang/mr/langconfig.php
  254. +1 1  install/lang/mr/moodle.php
  255. +1 1  install/lang/ms/langconfig.php
  256. +1 1  install/lang/ne/langconfig.php
  257. +1 1  install/lang/nl/admin.php
  258. +1 1  install/lang/nl/error.php
  259. +1 1  install/lang/nl/install.php
  260. +1 1  install/lang/nl/langconfig.php
  261. +1 1  install/lang/nl/moodle.php
  262. +1 1  install/lang/nn/langconfig.php
  263. +1 1  install/lang/nn/moodle.php
  264. +1 1  install/lang/no/admin.php
  265. +1 1  install/lang/no/error.php
  266. +1 1  install/lang/no/install.php
  267. +1 1  install/lang/no/langconfig.php
  268. +1 1  install/lang/no/moodle.php
  269. +1 1  install/lang/no_gr/langconfig.php
  270. +1 1  install/lang/no_gr/moodle.php
  271. +1 1  install/lang/oc_es/langconfig.php
  272. +1 1  install/lang/pl/admin.php
  273. +1 1  install/lang/pl/error.php
  274. +1 1  install/lang/pl/install.php
  275. +1 1  install/lang/pl/langconfig.php
  276. +1 1  install/lang/pl/moodle.php
  277. +1 1  install/lang/pt/admin.php
  278. +1 1  install/lang/pt/error.php
  279. +1 1  install/lang/pt/install.php
  280. +1 1  install/lang/pt/langconfig.php
  281. +1 1  install/lang/pt/moodle.php
  282. +1 1  install/lang/pt_br/admin.php
  283. +1 1  install/lang/pt_br/error.php
  284. +1 1  install/lang/pt_br/install.php
  285. +1 1  install/lang/pt_br/langconfig.php
  286. +1 1  install/lang/pt_br/moodle.php
  287. +1 1  install/lang/ro/admin.php
  288. +1 1  install/lang/ro/error.php
  289. +1 1  install/lang/ro/install.php
  290. +1 1  install/lang/ro/langconfig.php
  291. +1 1  install/lang/ro/moodle.php
  292. +1 1  install/lang/ru/admin.php
  293. +1 1  install/lang/ru/error.php
  294. +1 1  install/lang/ru/install.php
  295. +1 1  install/lang/ru/langconfig.php
  296. +1 1  install/lang/ru/moodle.php
  297. +1 1  install/lang/si/admin.php
  298. +1 1  install/lang/si/error.php
  299. +1 1  install/lang/si/install.php
  300. +1 1  install/lang/si/langconfig.php
  301. +1 1  install/lang/si/moodle.php
Sorry, we could not display the entire diff because too many files (473) changed.
13 admin/lib.php
@@ -35,5 +35,16 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
35 35 'admin-*' => get_string('page-admin-x', 'pagetype'),
36 36 $pagetype => get_string('page-admin-current', 'pagetype')
37 37 );
  38 + // Add the missing * (any page) option for them. MDL-30340
  39 + // TODO: These pages are really 'pagetype-varying' - MDL-30564 -
  40 + // and some day we should stop behaving that way, so proper pagetypes
  41 + // can be specified for it (like course-category-* or so).
  42 + // Luckly... the option we are introducing '*' is independent
  43 + // of that varying behavior, so will work.
  44 + if ($pagetype == 'admin-course-category') {
  45 + $array += array(
  46 + '*' => get_string('page-x', 'pagetype')
  47 + );
  48 + }
38 49 return $array;
39   -}
  50 +}
21 admin/roles/admins.php
@@ -67,6 +67,26 @@
67 67 }
68 68 }
69 69
  70 +} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
  71 + if ($newmain = $admisselector->get_selected_users()) {
  72 + $newmain = reset($newmain);
  73 + $newmain = $newmain->id;
  74 + $admins = array();
  75 + foreach(explode(',', $CFG->siteadmins) as $admin) {
  76 + $admin = (int)$admin;
  77 + if ($admin) {
  78 + $admins[$admin] = $admin;
  79 + }
  80 + }
  81 +
  82 + if (isset($admins[$newmain])) {
  83 + unset($admins[$newmain]);
  84 + array_unshift($admins, $newmain);
  85 + set_config('siteadmins', implode(',', $admins));
  86 + redirect($PAGE->url);
  87 + }
  88 + }
  89 +
70 90 } else if ($confirmadd and confirm_sesskey()) {
71 91 $admins = array();
72 92 foreach(explode(',', $CFG->siteadmins) as $admin) {
@@ -115,6 +135,7 @@
115 135 <p class="arrow_button">
116 136 <input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
117 137 <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
  138 + <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'role'); ?>" title="<?php print_string('mainadminset', 'role'); ?>" />
118 139 </p>
119 140 </td>
120 141 <td id='potentialcell'>
28 admin/roles/lib.php
@@ -1584,13 +1584,31 @@ public function find_users($search) {
1584 1584 return array();
1585 1585 }
1586 1586
1587   - if ($search) {
1588   - $groupname = get_string('extusersmatching', 'role', $search);
1589   - } else {
1590   - $groupname = get_string('extusers', 'role');
  1587 + $mainadmin = array();
  1588 + $adminids = explode(',', $CFG->siteadmins);
  1589 + foreach ($adminids as $id) {
  1590 + if (isset($availableusers[$id])) {
  1591 + $mainadmin = array($id=>$availableusers[$id]);
  1592 + unset($availableusers[$id]);
  1593 + break;
  1594 + }
1591 1595 }
1592 1596
1593   - return array($groupname => $availableusers);
  1597 + $result = array();
  1598 + if ($mainadmin) {
  1599 + $result[get_string('mainadmin', 'role')] = $mainadmin;
  1600 + }
  1601 +
  1602 + if ($availableusers) {
  1603 + if ($search) {
  1604 + $groupname = get_string('extusersmatching', 'role', $search);
  1605 + } else {
  1606 + $groupname = get_string('extusers', 'role');
  1607 + }
  1608 + $result[$groupname] = $availableusers;
  1609 + }
  1610 +
  1611 + return $result;
1594 1612 }
1595 1613
1596 1614 protected function get_options() {
1  admin/settings/security.php
@@ -81,6 +81,7 @@
81 81 $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0));
82 82 $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0));
83 83 $temp->add(new admin_setting_configcheckbox('allowframembedding', get_string('allowframembedding', 'admin'), get_string('allowframembedding_help', 'admin'), 0));
  84 + $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', get_string('loginpasswordautocomplete', 'admin'), get_string('loginpasswordautocomplete_help', 'admin'), 0));
84 85 $ADMIN->add('security', $temp);
85 86
86 87
3  admin/tool/customlang/db/upgrade.php
@@ -29,7 +29,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
29 29
30 30 $dbman = $DB->get_manager();
31 31
32   -
  32 + // Moodle v2.2.0 release upgrade line
  33 + // Put any upgrade step following this
33 34
34 35 return true;
35 36 }
3  auth/manual/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
48 48 // Moodle v2.1.0 release upgrade line
49 49 // Put any upgrade step following this
50 50
  51 + // Moodle v2.2.0 release upgrade line
  52 + // Put any upgrade step following this
  53 +
51 54 return true;
52 55 }
3  auth/mnet/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
46 46 // Moodle v2.1.0 release upgrade line
47 47 // Put any upgrade step following this
48 48
  49 + // Moodle v2.2.0 release upgrade line
  50 + // Put any upgrade step following this
  51 +
49 52 return true;
50 53 }
3  blocks/community/db/upgrade.php
@@ -76,5 +76,8 @@ function xmldb_block_community_upgrade($oldversion) {
76 76 // Moodle v2.1.0 release upgrade line
77 77 // Put any upgrade step following this
78 78
  79 + // Moodle v2.2.0 release upgrade line
  80 + // Put any upgrade step following this
  81 +
79 82 return true;
80 83 }
77 blocks/edit_form.php
@@ -93,24 +93,44 @@ function definition() {
93 93 $mform->addElement('static', 'bui_homecontext', get_string('createdat', 'block'), print_context_name($parentcontext));
94 94 $mform->addHelpButton('bui_homecontext', 'createdat', 'block');
95 95
  96 + // For pre-calculated (fixed) pagetype lists
  97 + $pagetypelist = array();
  98 +
96 99 // parse pagetype patterns
97 100 $bits = explode('-', $this->page->pagetype);
98 101
99   - $contextoptions = array();
100   - if ( ($parentcontext->contextlevel == CONTEXT_COURSE && $parentcontext->instanceid == SITEID) ||
101   - ($parentcontext->contextlevel == CONTEXT_SYSTEM)) { // Home page
102   - if ($bits[0] == 'tag' || $bits[0] == 'admin') {
103   - // tag and admin pages always use system context
104   - // the contexts options don't make differences, so we use
105   - // page type patterns only
106   - $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
107   - } else {
108   - $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
109   - $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
110   - $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block');
111   - $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
112   - $mform->addHelpButton('bui_contexts', 'contexts', 'block');
113   - }
  102 + // First of all, check if we are editing blocks @ front-page or no and
  103 + // make some dark magic if so (MDL-30340) because each page context
  104 + // implies one (and only one) harcoded page-type that will be set later
  105 + // when processing the form data at {@link block_manager::process_url_edit()}
  106 +
  107 + // There are some conditions to check related to contexts
  108 + $ctxconditions = $this->page->context->contextlevel == CONTEXT_COURSE &&
  109 + $this->page->context->instanceid == get_site()->id;
  110 + // And also some pagetype conditions
  111 + $pageconditions = isset($bits[0]) && isset($bits[1]) && $bits[0] == 'site' && $bits[1] == 'index';
  112 + // So now we can be 100% sure if edition is happening at frontpage
  113 + $editingatfrontpage = $ctxconditions && $pageconditions;
  114 +
  115 + // Let the form to know about that, can be useful later
  116 + $mform->addElement('hidden', 'bui_editingatfrontpage', (int)$editingatfrontpage);
  117 +
  118 + // Front page, show the page-contexts element and set $pagetypelist to 'any page' (*)
  119 + // as unique option. Processign the form will do any change if needed
  120 + if ($editingatfrontpage) {
  121 + $contextoptions = array();
  122 + $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
  123 + $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
  124 + $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block');
  125 + $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
  126 + $mform->addHelpButton('bui_contexts', 'contexts', 'block');
  127 + $pagetypelist['*'] = '*'; // This is not going to be shown ever, it's an unique option
  128 +
  129 + // Any other system context block, hide the page-contexts element,
  130 + // it's always system-wide BUI_CONTEXTS_ENTIRE_SITE
  131 + } else if ($parentcontext->contextlevel == CONTEXT_SYSTEM) {
  132 + $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
  133 +
114 134 } else if ($parentcontext->contextlevel == CONTEXT_COURSE) {
115 135 // 0 means display on current context only, not child contexts
116 136 // but if course managers select mod-* as pagetype patterns, block system will overwrite this option
@@ -126,12 +146,10 @@ function definition() {
126 146 $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
127 147 }
128 148
129   - $displaypagetypewarning = false;
130   - if ($this->page->pagetype == 'site-index') { // No need for pagetype list on home page
131   - $pagetypelist = array('*'=>get_string('page-x', 'pagetype'));
132   - } else {
133   - // Generate pagetype patterns by callbacks
  149 + // Generate pagetype patterns by callbacks if necessary (has not been set specifically)
  150 + if (empty($pagetypelist)) {
134 151 $pagetypelist = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context);
  152 + $displaypagetypewarning = false;
135 153 if (!array_key_exists($this->block->instance->pagetypepattern, $pagetypelist)) {
136 154 // Pushing block's existing page type pattern
137 155 $pagetypestringname = 'page-'.str_replace('*', 'x', $this->block->instance->pagetypepattern);
@@ -156,6 +174,25 @@ function definition() {
156 174 } else {
157 175 $value = array_pop(array_keys($pagetypelist));
158 176 $mform->addElement('hidden', 'bui_pagetypepattern', $value);
  177 + // Now we are really hiding a lot (both page-contexts and page-type-patterns),
  178 + // specially in some systemcontext pages having only one option (my/user...)
  179 + // so, until it's decided if we are going to add the 'bring-back' pattern to
  180 + // all those pages or no (see MDL-30574), we are going to show the unique
  181 + // element statically
  182 + // TODO: Revisit this once MDL-30574 has been decided and implemented, although
  183 + // perhaps it's not bad to always show this statically when only one pattern is
  184 + // available.
  185 + if (!$editingatfrontpage) {
  186 + // Try to beautify it
  187 + $strvalue = $value;
  188 + $strkey = 'page-'.str_replace('*', 'x', $strvalue);
  189 + if (get_string_manager()->string_exists($strkey, 'pagetype')) {
  190 + $strvalue = get_string($strkey, 'pagetype');
  191 + }
  192 + // Show as static (hidden has been set already)
  193 + $mform->addElement('static', 'bui_staticpagetypepattern',
  194 + get_string('restrictpagetypes','block'), $strvalue);
  195 + }
159 196 }
160 197
161 198 if ($this->page->subpage) {
3  blocks/html/db/upgrade.php
@@ -66,5 +66,8 @@ function xmldb_block_html_upgrade($oldversion) {
66 66 // Moodle v2.1.0 release upgrade line
67 67 // Put any upgrade step following this
68 68
  69 + // Moodle v2.2.0 release upgrade line
  70 + // Put any upgrade step following this
  71 +
69 72 return true;
70 73 }
7 blocks/login/block_login.php
@@ -48,7 +48,12 @@ function get_content () {
48 48 $this->content->text .= '<input type="text" name="username" id="login_username" value="'.s($username).'" /></div>';
49 49
50 50 $this->content->text .= '<div class="c1 fld password"><label for="login_password">'.get_string('password').'</label>';
51   - $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
  51 +
  52 + if (!empty($CFG->loginpasswordautocomplete)) {
  53 + $this->content->text .= '<input type="password" name="password" id="login_password" value="" autocomplete="off" /></div>';
  54 + } else {
  55 + $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
  56 + }
52 57
53 58 if (isset($CFG->rememberusername) and $CFG->rememberusername == 2) {
54 59 $checked = $username ? 'checked="checked"' : '';
3  blocks/navigation/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
75 75 // Moodle v2.1.0 release upgrade line
76 76 // Put any upgrade step following this
77 77
  78 + // Moodle v2.2.0 release upgrade line
  79 + // Put any upgrade step following this
  80 +
78 81 return true;
79 82 }
3  blocks/settings/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
75 75 // Moodle v2.1.0 release upgrade line
76 76 // Put any upgrade step following this
77 77
  78 + // Moodle v2.2.0 release upgrade line
  79 + // Put any upgrade step following this
  80 +
78 81 return true;
79 82 }
30 course/format/scorm/version.php
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +// This file is part of Moodle - http://moodle.org/
  3 +//
  4 +// Moodle is free software: you can redistribute it and/or modify
  5 +// it under the terms of the GNU General Public License as published by
  6 +// the Free Software Foundation, either version 3 of the License, or
  7 +// (at your option) any later version.
  8 +//
  9 +// Moodle is distributed in the hope that it will be useful,
  10 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12 +// GNU General Public License for more details.
  13 +//
  14 +// You should have received a copy of the GNU General Public License
  15 +// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
  16 +
  17 +/**
  18 + * Version details
  19 + *
  20 + * @package format
  21 + * @subpackage scorm
  22 + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
  23 + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  24 + */
  25 +
  26 +defined('MOODLE_INTERNAL') || die();
  27 +
  28 +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
  29 +$plugin->requires = 2011120100; // Requires this Moodle version
  30 +$plugin->component = 'format_scorm'; // Full name of the plugin (used for diagnostics)
30 course/format/social/version.php
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +// This file is part of Moodle - http://moodle.org/
  3 +//
  4 +// Moodle is free software: you can redistribute it and/or modify
  5 +// it under the terms of the GNU General Public License as published by
  6 +// the Free Software Foundation, either version 3 of the License, or
  7 +// (at your option) any later version.
  8 +//
  9 +// Moodle is distributed in the hope that it will be useful,
  10 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12 +// GNU General Public License for more details.
  13 +//
  14 +// You should have received a copy of the GNU General Public License
  15 +// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
  16 +
  17 +/**
  18 + * Version details
  19 + *
  20 + * @package format
  21 + * @subpackage social
  22 + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
  23 + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  24 + */
  25 +
  26 +defined('MOODLE_INTERNAL') || die();
  27 +
  28 +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
  29 +$plugin->requires = 2011120100; // Requires this Moodle version
  30 +$plugin->component = 'format_social'; // Full name of the plugin (used for diagnostics)
30 course/format/topics/version.php
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +// This file is part of Moodle - http://moodle.org/
  3 +//
  4 +// Moodle is free software: you can redistribute it and/or modify
  5 +// it under the terms of the GNU General Public License as published by
  6 +// the Free Software Foundation, either version 3 of the License, or
  7 +// (at your option) any later version.
  8 +//
  9 +// Moodle is distributed in the hope that it will be useful,
  10 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12 +// GNU General Public License for more details.
  13 +//
  14 +// You should have received a copy of the GNU General Public License
  15 +// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
  16 +
  17 +/**
  18 + * Version details
  19 + *
  20 + * @package format
  21 + * @subpackage topics
  22 + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
  23 + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  24 + */
  25 +
  26 +defined('MOODLE_INTERNAL') || die();
  27 +
  28 +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
  29 +$plugin->requires = 2011120100; // Requires this Moodle version
  30 +$plugin->component = 'format_topics'; // Full name of the plugin (used for diagnostics)
30 course/format/weeks/version.php
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +// This file is part of Moodle - http://moodle.org/
  3 +//
  4 +// Moodle is free software: you can redistribute it and/or modify
  5 +// it under the terms of the GNU General Public License as published by
  6 +// the Free Software Foundation, either version 3 of the License, or
  7 +// (at your option) any later version.
  8 +//
  9 +// Moodle is distributed in the hope that it will be useful,
  10 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12 +// GNU General Public License for more details.
  13 +//
  14 +// You should have received a copy of the GNU General Public License
  15 +// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
  16 +
  17 +/**
  18 + * Version details
  19 + *
  20 + * @package format
  21 + * @subpackage weeks
  22 + * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
  23 + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  24 + */
  25 +
  26 +defined('MOODLE_INTERNAL') || die();
  27 +
  28 +$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
  29 +$plugin->requires = 2011120100; // Requires this Moodle version
  30 +$plugin->component = 'format_weeks'; // Full name of the plugin (used for diagnostics)
3  enrol/authorize/db/upgrade.php
@@ -96,5 +96,8 @@ function xmldb_enrol_authorize_upgrade($oldversion) {
96 96 // Moodle v2.1.0 release upgrade line
97 97 // Put any upgrade step following this
98 98
  99 + // Moodle v2.2.0 release upgrade line
  100 + // Put any upgrade step following this
  101 +
99 102 return true;
100 103 }
3  enrol/database/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
39 39 }
40 40
41 41
  42 + // Moodle v2.2.0 release upgrade line
  43 + // Put any upgrade step following this
  44 +
42 45 return true;
43 46 }
2  enrol/database/lib.php
@@ -185,7 +185,7 @@ public function sync_user_enrolments($user) {
185 185
186 186 $existing = array();
187 187 foreach ($current as $r) {
188   - if (in_array($r->id, $roles)) {
  188 + if (in_array($r->roleid, $roles)) {
189 189 $existing[$r->roleid] = $r->roleid;
190 190 } else {
191 191 role_unassign($r->roleid, $user->id, $context->id, 'enrol_database', $instance->id);
2  enrol/flatfile/db/upgrade.php
@@ -62,6 +62,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
62 62 upgrade_plugin_savepoint(true, 2010091400, 'enrol', 'flatfile');
63 63 }
64 64
  65 + // Moodle v2.2.0 release upgrade line
  66 + // Put any upgrade step following this
65 67
66 68 return $result;
67 69 }
46 enrol/guest/db/upgrade.php
... ... @@ -0,0 +1,46 @@
  1 +<?php
  2 +// This file is part of Moodle - http://moodle.org/
  3 +//
  4 +// Moodle is free software: you can redistribute it and/or modify
  5 +// it under the terms of the GNU General Public License as published by
  6 +// the Free Software Foundation, either version 3 of the License, or
  7 +// (at your option) any later version.
  8 +//
  9 +// Moodle is distributed in the hope that it will be useful,
  10 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
  11 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  12 +// GNU General Public License for more details.
  13 +//
  14 +// You should have received a copy of the GNU General Public License
  15 +// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
  16 +
  17 +/**
  18 + * This file keeps track of upgrades to the guest enrolment plugin
  19 + *
  20 + * @package enrol
  21 + * @subpackage guest
  22 + * @copyright 2011 Petr Skoda {@link http://skodak.org
  23 + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  24 + */
  25 +
  26 +defined('MOODLE_INTERNAL') || die();
  27 +
  28 +function xmldb_enrol_guest_upgrade($oldversion) {
  29 + global $CFG, $DB, $OUTPUT;
  30 +
  31 + $dbman = $DB->get_manager();
  32 +
  33 + // Moodle v2.2.0 release upgrade line
  34 + // Put any upgrade step following this
  35 +
  36 + if ($oldversion < 2011112901) {
  37 + // convert all null passwords to empty strings
  38 + $DB->set_field('enrol', 'password', '', array('enrol'=>'guest', 'password'=>null));
  39 +
  40 + upgrade_plugin_savepoint(true, 2011112901, 'enrol', 'guest');
  41 + }
  42 +
  43 + return true;
  44 +}
  45 +
  46 +
16 enrol/guest/lib.php
@@ -328,6 +328,22 @@ public function course_updated($inserted, $course, $data) {
328 328 }
329 329
330 330 /**
  331 + * Add new instance of enrol plugin.
  332 + * @param object $course
  333 + * @param array instance fields
  334 + * @return int id of new instance, null if can not be created
  335 + */
  336 + public function add_instance($course, array $fields = NULL) {
  337 + $fields = (array)$fields;
  338 +
  339 + if (!isset($fields['password'])) {
  340 + $fields['password'] = '';
  341 + }
  342 +
  343 + return parent::add_instance($course, $fields);
  344 + }
  345 +
  346 + /**
331 347 * Add new instance of enrol plugin with default settings.
332 348 * @param object $course
333 349 * @return int id of new instance
2  enrol/guest/version.php
@@ -25,6 +25,6 @@
25 25
26 26 defined('MOODLE_INTERNAL') || die();
27 27
28   -$plugin->version = 2011112900; // The current plugin version (Date: YYYYMMDDXX)
  28 +$plugin->version = 2011112901; // The current plugin version (Date: YYYYMMDDXX)
29 29 $plugin->requires = 2011112900; // Requires this Moodle version
30 30 $plugin->component = 'enrol_guest'; // Full name of the plugin (used for diagnostics)
3  enrol/imsenterprise/db/upgrade.php
@@ -83,6 +83,9 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
83 83 // Moodle v2.1.0 release upgrade line
84 84 // Put any upgrade step following this
85 85
  86 + // Moodle v2.2.0 release upgrade line
  87 + // Put any upgrade step following this
  88 +
86 89 return true;
87 90 }
88 91
4 enrol/imsenterprise/lib.php
@@ -403,6 +403,10 @@ function process_group_tag($tagcontents) {
403 403
404 404 $courseid = $DB->insert_record('course', $course);
405 405
  406 + // Setup default enrolment plugins
  407 + $course->id = $courseid;
  408 + enrol_course_updated(true, $course, null);
  409 +
406 410 // Setup the blocks
407 411 $course = $DB->get_record('course', array('id' => $courseid));
408 412 blocks_add_default_course_blocks($course);
3  enrol/mnet/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
39 39 // Moodle v2.1.0 release upgrade line
40 40 // Put any upgrade step following this
41 41
  42 + // Moodle v2.2.0 release upgrade line
  43 + // Put any upgrade step following this
  44 +
42 45 return true;
43 46 }
3  enrol/paypal/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
62 62 // Moodle v2.1.0 release upgrade line
63 63 // Put any upgrade step following this
64 64
  65 + // Moodle v2.2.0 release upgrade line
  66 + // Put any upgrade step following this
  67 +
65 68 return true;
66 69 }
0  filter/emailprotect/vesion.php → filter/emailprotect/version.php
File renamed without changes
3  filter/mediaplugin/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
46 46 // Moodle v2.1.0 release upgrade line
47 47 // Put any upgrade step following this
48 48
  49 + // Moodle v2.2.0 release upgrade line
  50 + // Put any upgrade step following this
  51 +
49 52 return true;
50 53 }
3  filter/tex/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
41 41 // Moodle v2.1.0 release upgrade line
42 42 // Put any upgrade step following this
43 43
  44 + // Moodle v2.2.0 release upgrade line
  45 + // Put any upgrade step following this
  46 +
44 47 return true;
45 48 }
3  grade/grading/form/rubric/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
35 35
36 36 $dbman = $DB->get_manager();
37 37
  38 + // Moodle v2.2.0 release upgrade line
  39 + // Put any upgrade step following this
  40 +
38 41 return true;
39 42 }
2  grade/report/user/index.php
@@ -103,7 +103,7 @@
103 103
104 104 if ($user_selector) {
105 105 $renderer = $PAGE->get_renderer('gradereport_user');
106   - echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, false);
  106 + echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, true);
107 107 }
108 108
109 109 while ($userdata = $gui->next_user()) {
2  index.php
@@ -58,7 +58,7 @@
58 58 // Redirect logged-in users to My Moodle overview if required
59 59 if (optional_param('setdefaulthome', false, PARAM_BOOL)) {
60 60 set_user_preference('user_home_page_preference', HOMEPAGE_SITE);
61   - } else if ($CFG->defaulthomepage == HOMEPAGE_MY && (optional_param('redirect', true, PARAM_BOOL) || !$hassiteconfig)) {
  61 + } else if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 1) {
62 62 redirect($CFG->wwwroot .'/my/');
63 63 } else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) {
64 64 $PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING);
2  install/lang/af/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/af/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/am/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/am/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/am/moodle.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ar/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ar/error.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ar/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ar/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ar/moodle.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ast/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ast/error.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ast/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ast/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/ast/moodle.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/az/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/az/error.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/az/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/az/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/be/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/be/moodle.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bg/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bg/error.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bg/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bg/langconfig.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bg/moodle.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bn/admin.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.3dev installer
20 20 *
21 21 * Do not edit this file manually! It contains just a subset of strings
22 22 * needed during the very first steps of installation. This file was
2  install/lang/bn/install.php
@@ -16,7 +16,7 @@
16 16 // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
17 17
18 18 /**
19   - * Automatically generated strings for Moodle 2.2beta installer
  19 + * Automatically generated strings for Moodle 2.