MDL-15252 MDL-21375 Removing illegal stringid '*' and some whitespace

blocks/edit_form.php

@@ -105,7 +105,7 @@ class block_edit_form extends moodleform {
         $pagetypeoptions = array();
         foreach ($pagetypelist as $pagetype) {         // Find human-readable names for the pagetypes
             $pagetypeoptions[$pagetype] = $pagetype;
-            $pagetypestringname = 'page-'.str_replace('*', 'x',$pagetype);  // Better names MDL-21375 
+            $pagetypestringname = 'page-'.str_replace('*', 'x',$pagetype);  // Better names MDL-21375
             $pagetypestring = get_string($pagetypestringname, 'pagetype');
             if (substr($pagetypestring, 0, 1) != '[') {
                 $pagetypeoptions[$pagetype] .= ' ('.$pagetypestring.')';

lang/en/block.php

@@ -23,7 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['*'] = 'Any page';
 $string['addtodock'] = 'Move this to the dock';
 $string['anypagematchingtheabove'] = 'Any page matching the above';
 $string['appearsinsubcontexts'] = 'Appears in sub-contexts';

lib/blocklib.php

@@ -1400,7 +1400,7 @@ function matching_page_type_patterns($pagetype) {
         $patterns[] = implode('-', $bits) . '-*';
         array_pop($bits);
     }
-     $patterns[] = '*';
+    $patterns[] = '*';
     return $patterns;
 }