MDL-30340 blocks - incorrect option in user profile template and missing lang string...

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 814dc36..7662cce 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -1717,7 +1717,7 @@ function default_page_type_list($pagetype, $parentcontext = null, $currentcontex
  * @return array
  */
 function my_page_type_list($pagetype, $parentcontext = null, $currentcontext = null) {
-    return array('my-index' => 'my-index');
+    return array('my-index' => get_string('page-my-index', 'pagetype'));
 }
 
 /**

diff --git a/user/lib.php b/user/lib.php
index 7c2267f..66f8404 100644 (file)
--- a/user/lib.php
+++ b/user/lib.php
@@ -392,8 +392,5 @@ function user_get_user_details($user, $course = null, array $userfields = array(
  * @param stdClass $currentcontext Current context of block
  */
 function user_page_type_list($pagetype, $parentcontext, $currentcontext) {
-    return array(
-        'user-profile'=>get_string('page-user-profile', 'pagetype'),
-        'my-index'=>get_string('page-my-index', 'pagetype')
-    );
+    return array('user-profile'=>get_string('page-user-profile', 'pagetype'));
 }