- added tag:editblocks capability

diff --git a/admin/settings/security.php b/admin/settings/security.php
index 65aff67896a9cf197632c4bb9737e61ccc542248..285007849ea238b5fb7ad93aa7fb1e05cbeb3355 100644 (file)
--- a/admin/settings/security.php
+++ b/admin/settings/security.php
@@ -38,6 +38,7 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                           1 => get_string('personalblogs','blog'),
                                                                                                                                           0 => get_string('disableblogs','blog'))));
 $temp->add(new admin_setting_configcheckbox('usetags', get_string('usetags','admin'),get_string('configusetags', 'admin'),'1'));
+$temp->add(new admin_setting_configcheckbox('keeptagnamecase', get_string('keeptagnamecase','admin'),get_string('configkeeptagnamecase', 'admin'),'0'));
 $temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
 $temp->add(new admin_setting_configpasswordunmask('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), '', PARAM_RAW));
 

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 4686d83f5bea67abe1e6f2b09c92951acd5622f5..2f03df6adbbefb167176f8d7910df63a7fc27ba9 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -119,6 +119,7 @@ $string['configintroadmin'] = 'On this page you should configure your main admin
 $string['configintrosite'] = 'This page allows you to configure the front page and name of this new site.  You can come back here later to change these settings any time using the Administration menus.';
 $string['configintrotimezones'] = 'This page will search for new information about world timezones (including daylight savings time rules) and update your local database with this information.  These locations will be checked, in order: $a This procedure is generally very safe and can not break normal installations.  Do you wish to update your timezones now?';
 $string['configiplookup'] = 'When you click on an IP address (such as 34.12.222.93), such as in the logs, you are shown a map with a best guess of where that IP is located.  There are different plugins for this that you can choose from, each has benefits and disadvantages.';
+$string['configkeeptagnamecase'] = 'Check this if you want tag names to keep the original casing as entered by users who created them';
 $string['configlang'] = 'Choose a default language for the whole site.  Users can override this setting later.';
 $string['configlangcache'] = 'Cache the language menu. Saves a lot of memory and processing power. If you enable this, the menu takes a few minutes to update after you have added or removed languages.';
 $string['configlangdir'] = 'Most languages are printed left-to-right, but some, like Arabic and Hebrew, are printed right-to-left.';
@@ -353,6 +354,7 @@ $string['intcachemax'] = 'Int. cache max';
 $string['invalidsection'] = 'Invalid section.';
 $string['invaliduserchangeme'] = 'Username \"changeme\" is reserved -- you cannot create an account with it.';
 $string['iplookup'] = 'IP address lookup';
+$string['keeptagnamecase'] = 'Keep tag name casing';
 $string['lang'] = 'Default language';
 $string['lang16notify'] = 'Moodle 1.6 and above allows you to install and update language packs directly from download.moodle.org by following the link below';
 $string['langcache'] = 'Cache language menu';

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index fcb443e05b8e7742fb815c85d9e7fa4eabba0ebf..0d5ed0d6148c306526c294be69abe470e4fc0844 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -132,6 +132,7 @@ $string['site:viewreports'] = 'View reports';
 $string['tag:manage'] = 'Manage all tags';
 $string['tag:create'] = 'Create new tags';
 $string['tag:edit'] = 'Edit existing tags';
+$string['tag:editblocks'] = 'Edit blocks in tags pages';
 $string['user:changeownpassword'] = 'Change own password';
 $string['user:create'] = 'Create users';
 $string['user:delete'] = 'Delete users';

diff --git a/lang/en_utf8/tag.php b/lang/en_utf8/tag.php
index 4892c5e7550617deb3c1f6e110a483a4024f2e0c..7b74327f238e09a26e347ee29bdfb1f73b599dc2 100644 (file)
--- a/lang/en_utf8/tag.php
+++ b/lang/en_utf8/tag.php
@@ -31,5 +31,6 @@ $string['thistaghasnodesc'] = 'This tag currently has no description.';
 $string['timemodified'] = 'Modified';
 $string['userstaggedwith'] = 'Users tagged with \"$a\"';
 $string['updatetag'] = 'Update';
+$string['withselectedtags'] = 'With selected tags...';
 
 ?>

diff --git a/lib/db/access.php b/lib/db/access.php
index 88873635180464788ab3f04a8a45457f04596b6d..ef0290726fe742271a9d3d7d82b9923231a90593 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -1131,7 +1131,16 @@ $moodle_capabilities = array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'legacy' => array(
-            'student' => CAP_ALLOW,
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        )
+    ),
+    
+    'moodle/tag:editblocks' => array(
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
             'teacher' => CAP_ALLOW,
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
@@ -1139,4 +1148,5 @@ $moodle_capabilities = array(
     )
 );
 
+
 ?>