diff --git a/lib/setuplib.php b/lib/setuplib.php
index c4b07ee06d1..1056db449a1 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -691,7 +691,6 @@ function initialise_fullme() {
     $FULLSCRIPT = $hostandport . $rurl['path'];
     $FULLME = $hostandport . $rurl['fullpath'];
     $ME = $rurl['fullpath'];
-    $rurl['path'] = $rurl['fullpath'];
 }
 
 /**
@@ -776,6 +775,11 @@ function setup_get_remote_url() {
      } else {
         throw new moodle_exception('unsupportedwebserver', 'error', '', $_SERVER['SERVER_SOFTWARE']);
     }
+
+    // sanitize the url a bit more, the encoding style may be different in vars above
+    $rurl['fullpath'] = str_replace('"', '%22', $rurl['fullpath']);
+    $rurl['fullpath'] = str_replace('\'', '%27', $rurl['fullpath']);
+
     return $rurl;
 }
 
diff --git a/theme/anomaly/layout/general.php b/theme/anomaly/layout/general.php
index 048f3b6719f..9048711009b 100644
--- a/theme/anomaly/layout/general.php
+++ b/theme/anomaly/layout/general.php
@@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/anomaly/layout/report.php b/theme/anomaly/layout/report.php
index 290643cda81..53c368af2c4 100644
--- a/theme/anomaly/layout/report.php
+++ b/theme/anomaly/layout/report.php
@@ -19,7 +19,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/arialist/layout/frontpage.php b/theme/arialist/layout/frontpage.php
index 15dd2e0c2c0..4a5156aea5a 100644
--- a/theme/arialist/layout/frontpage.php
+++ b/theme/arialist/layout/frontpage.php
@@ -24,7 +24,7 @@ if (!empty($PAGE->theme->settings->tagline)) {
 } else {
     $tagline = '<!-- There was no custom tagline set -->';
 }
-if (!empty($PAGE->theme->settings->logo)) { 
+if (!empty($PAGE->theme->settings->logo)) {
     $logourl = $PAGE->theme->settings->logo;
 }
 
@@ -33,11 +33,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <?php if ($hascustommenu) { ?>
@@ -70,7 +70,7 @@ echo $OUTPUT->doctype() ?>
                 </div>
             </div>
         </div>
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
             <div id="page-content">
                 <div id="region-main-box">
                     <div id="region-post-box">
-            
+
                         <div id="region-main-wrap">
                             <div id="region-main">
                                 <div class="region-content">
@@ -87,7 +87,7 @@ echo $OUTPUT->doctype() ?>
                                 </div>
                             </div>
                         </div>
-                
+
                         <?php if ($hassidepost) { ?>
                         <div id="region-post" class="block-region">
                             <div class="region-content">
diff --git a/theme/arialist/layout/general.php b/theme/arialist/layout/general.php
index 141aa59eeea..802ef55dd7c 100644
--- a/theme/arialist/layout/general.php
+++ b/theme/arialist/layout/general.php
@@ -27,7 +27,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <?php if ($hascustommenu) { ?>
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
             <div id="page-content">
                 <div id="region-main-box">
                     <div id="region-post-box">
-            
+
                         <div id="region-main-wrap">
                             <div id="region-main">
                                 <div class="region-content">
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
                                 </div>
                             </div>
                         </div>
-                
+
                         <?php if ($hassidepost) { ?>
                         <div id="region-post" class="block-region">
                             <div class="region-content">
@@ -93,7 +93,7 @@ echo $OUTPUT->doctype() ?>
                             </div>
                         </div>
                         <?php } ?>
-                
+
                     </div>
                 </div>
             </div>
diff --git a/theme/arialist/layout/report.php b/theme/arialist/layout/report.php
index 2ddb330a2c2..f254a5cb7f0 100644
--- a/theme/arialist/layout/report.php
+++ b/theme/arialist/layout/report.php
@@ -27,7 +27,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <?php if ($hascustommenu) { ?>
diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php
index 5d222025429..a5dd7414ed0 100644
--- a/theme/base/layout/embedded.php
+++ b/theme/base/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/base/layout/frontpage.php b/theme/base/layout/frontpage.php
index bd2774d5140..31faa98981e 100644
--- a/theme/base/layout/frontpage.php
+++ b/theme/base/layout/frontpage.php
@@ -25,10 +25,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -49,7 +49,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -57,7 +57,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -65,7 +65,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -73,7 +73,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/base/layout/general.php b/theme/base/layout/general.php
index 2d13385ef93..26f27fc3ee7 100644
--- a/theme/base/layout/general.php
+++ b/theme/base/layout/general.php
@@ -32,7 +32,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 <div id="page">
 <?php if ($hasheading || $hasnavbar) { ?>
@@ -64,7 +64,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -72,7 +72,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -80,7 +80,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
diff --git a/theme/base/layout/report.php b/theme/base/layout/report.php
index 7b2196f99f5..8afd061a77f 100644
--- a/theme/base/layout/report.php
+++ b/theme/base/layout/report.php
@@ -26,7 +26,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 <div id="page">
 <?php if ($hasheading || $hasnavbar) { ?>
diff --git a/theme/binarius/layout/frontpage.php b/theme/binarius/layout/frontpage.php
index b5402c93f56..ab1930275ef 100644
--- a/theme/binarius/layout/frontpage.php
+++ b/theme/binarius/layout/frontpage.php
@@ -25,11 +25,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?>
                 <?php } ?>
             </div>
         </div>
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
             <div id="page-content">
                 <div id="region-main-box">
                     <div id="region-post-box">
-            
+
                         <div id="region-main-wrap">
                             <div id="region-main">
                                 <div class="region-content">
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
                                 </div>
                             </div>
                         </div>
-                
+
                         <?php if ($hassidepost) { ?>
                         <div id="region-post" class="block-region">
                             <div class="region-content">
@@ -86,7 +86,7 @@ echo $OUTPUT->doctype() ?>
             <div class="myclear"></div>
 
         </div>
-       
+
 
 <!-- END OF CONTENT -->
     <div class="myclear"></div>
diff --git a/theme/binarius/layout/general.php b/theme/binarius/layout/general.php
index 2395d0ab75d..e601ed07e9a 100644
--- a/theme/binarius/layout/general.php
+++ b/theme/binarius/layout/general.php
@@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
             <div id="page-content">
                 <div id="region-main-box">
                     <div id="region-post-box">
-            
+
                         <div id="region-main-wrap">
                             <div id="region-main">
                                 <div class="region-content">
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
                                 </div>
                             </div>
                         </div>
-                
+
                         <?php if ($hassidepost) { ?>
                         <div id="region-post" class="block-region">
                             <div class="region-content">
@@ -93,7 +93,7 @@ echo $OUTPUT->doctype() ?>
                             </div>
                         </div>
                         <?php } ?>
-                
+
                     </div>
                 </div>
             </div>
diff --git a/theme/binarius/layout/report.php b/theme/binarius/layout/report.php
index a67f792baf5..3225a5d3346 100644
--- a/theme/binarius/layout/report.php
+++ b/theme/binarius/layout/report.php
@@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/boxxie/layout/embedded.php b/theme/boxxie/layout/embedded.php
index 7ce54561de1..41e141feca8 100644
--- a/theme/boxxie/layout/embedded.php
+++ b/theme/boxxie/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page-wrapper" class="embedded">
diff --git a/theme/boxxie/layout/frontpage.php b/theme/boxxie/layout/frontpage.php
index 822be30aecf..98288f16256 100644
--- a/theme/boxxie/layout/frontpage.php
+++ b/theme/boxxie/layout/frontpage.php
@@ -29,8 +29,8 @@ echo $OUTPUT->doctype() ?>
   <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
   <?php echo $OUTPUT->standard_head_html() ?>
 </head>
- 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
@@ -38,7 +38,7 @@ echo $OUTPUT->doctype() ?>
 
 <div id="page-wrapper">
   <div id="page" class="clearfix">
-    
+
     <div id="page-header" class="clearfix">
       <?php if ($PAGE->heading) { ?>
         <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -56,11 +56,11 @@ echo $OUTPUT->doctype() ?>
     </div>
 
 <?php } ?>
-      
+
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre">
                     <div class="region-content">
@@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post">
                     <div class="region-content">
@@ -84,29 +84,29 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
-    
+
     <div class="clearfix"></div>
 <?php if ($hasfooter) { ?>
-  
+
     <div id="page-footer" class="clearfix">
       <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
       <?php echo $OUTPUT->login_info(); ?>
     </div>
-    
-    
+
+
 <?php }
 
 if ($hasheading || $hasnavbar) { ?>
-  
+
  	<div class="myclear"></div>
   </div> <!-- END #page -->
-  
+
 </div> <!-- END #page-wrapper -->
-	
+
 <?php } ?>
 
 <div id="page-footer-bottom">
@@ -116,7 +116,7 @@ if ($hasheading || $hasnavbar) { ?>
   echo $OUTPUT->standard_footer_html();
 } ?>
 
-</div>     
+</div>
 
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
 </body>
diff --git a/theme/boxxie/layout/general.php b/theme/boxxie/layout/general.php
index eaab94d6b18..495135c0999 100644
--- a/theme/boxxie/layout/general.php
+++ b/theme/boxxie/layout/general.php
@@ -29,8 +29,8 @@ echo $OUTPUT->doctype() ?>
   <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
   <?php echo $OUTPUT->standard_head_html() ?>
 </head>
- 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
@@ -38,7 +38,7 @@ echo $OUTPUT->doctype() ?>
 
 <div id="page-wrapper">
   <div id="page" class="clearfix">
-    
+
     <div id="page-header" class="clearfix">
       <?php if ($PAGE->heading) { ?>
         <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -56,20 +56,20 @@ echo $OUTPUT->doctype() ?>
     </div>
 
  <div class="myclear"></div>
-      
+
       <?php if ($hasnavbar) { ?>
         <div class="navbar clearfix">
           <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
           <div class="navbutton"> <?php echo $PAGE->button; ?></div>
         </div>
       <?php } ?>
-  
+
 <?php } ?>
-      
+
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre">
                     <div class="region-content">
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post">
                     <div class="region-content">
@@ -93,14 +93,14 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
-    
+
     <div class="myclear"></div>
 <?php if ($hasfooter) { ?>
-  
+
     <div id="page-footer" class="clearfix">
       <p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
       <?php echo $OUTPUT->login_info(); ?>
@@ -111,7 +111,7 @@ echo $OUTPUT->doctype() ?>
 if ($hasheading || $hasnavbar) { ?>
    <div class="myclear"></div>
   </div> <!-- END #page -->
- 
+
 </div> <!-- END #page-wrapper -->
 
 <?php } ?>
@@ -122,11 +122,11 @@ if ($hasheading || $hasnavbar) { ?>
 
   echo $OUTPUT->home_link();
   echo $OUTPUT->standard_footer_html();
-  
+
 } ?>
 
-</div>     
-     
+</div>
+
 
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
 </body>
diff --git a/theme/brick/layout/frontpage.php b/theme/brick/layout/frontpage.php
index 9bedc9a3914..279b82cbcd6 100644
--- a/theme/brick/layout/frontpage.php
+++ b/theme/brick/layout/frontpage.php
@@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <!-- START OF HEADER -->
@@ -41,9 +41,9 @@ echo $OUTPUT->doctype() ?>
 				<a href="<?php echo $CFG->wwwroot; ?>" title="Home"><?php echo $PAGE->heading ?></a>
 			</div>
 		<?php } ?>
-		
+
 		<div id="loggedinas">
-			<?php if ($hasheading) { 
+			<?php if ($hasheading) {
    	        	echo $OUTPUT->lang_menu();
        	    	echo $OUTPUT->login_info();
            		echo $PAGE->headingmenu;
@@ -51,13 +51,13 @@ echo $OUTPUT->doctype() ?>
 		</div>
 
 		<div id="headerbottom">
-		
+
 			<div id="menu">
 				<?php if ($hascustommenu) { ?>
  					<div id="custommenu"><?php echo $custommenu; ?></div>
 				<?php } ?>
 			</div>
-			
+
 		</div>
 
 	</div>
@@ -78,26 +78,26 @@ echo $OUTPUT->doctype() ?>
 		    	<div id="page-content">
     		    	<div id="region-main-box">
         		    	<div id="region-post-box">
-            
+
 	            	    	<div id="region-main-wrap">
     	            	    	<div id="region-main">
         	            	    	<div class="region-content">
-        	            	            	            	    
+
             	            	    	<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
 	                	        	</div>
     	                		</div>
 	    	            	</div>
-                
+
 		                	<?php if ($hassidepost) { ?>
     		            	<div id="region-post" class="block-region">
         		            	<div class="region-content">
-        		        
+
             		            	<?php echo $OUTPUT->blocks_for_region('side-post') ?>
-            		             
+
                 		    	</div>
 	                		</div>
 	    	            	<?php } ?>
-                
+
     	    	    	</div>
 	    	    	</div>
 	    		</div>
@@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF CONTENT -->
 
-	
+
 		</div>
 	</div>
 </div>
diff --git a/theme/brick/layout/general.php b/theme/brick/layout/general.php
index 319758e91e6..43ea28dbc02 100644
--- a/theme/brick/layout/general.php
+++ b/theme/brick/layout/general.php
@@ -26,19 +26,19 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <!-- START OF HEADER -->
 
 <div id="headerwrap">
 	<div id="header">
-	
+
 		<?php if (!empty($PAGE->theme->settings->logo)) { ?>
-		
+
 			<div id="logo">
 			</div>
-		
+
 		<?php } else { ?>
 
 			<div id="nologo">
@@ -46,9 +46,9 @@ echo $OUTPUT->doctype() ?>
 			</div>
 
 		<?php } ?>
-		
+
 			<div id="loggedinas">
-			<?php if ($hasheading) { 
+			<?php if ($hasheading) {
             	echo $OUTPUT->lang_menu();
             	echo $OUTPUT->login_info();
             	echo $PAGE->headingmenu;
@@ -56,7 +56,7 @@ echo $OUTPUT->doctype() ?>
 			</div>
 
 		<div id="headerbottom">
-			
+
 			<div id="menu">
 				<?php if ($hascustommenu) { ?>
  					<div id="custommenu"><?php echo $custommenu; ?></div>
@@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
 	    			<h1><?php echo $PAGE->heading ?></h1>
 	    		</div>
 	    	<?php } ?>
-	    	
+
 		</div>
 
 	</div>
@@ -87,11 +87,11 @@ echo $OUTPUT->doctype() ?>
 		    	<div id="page-content">
     		    	<div id="region-main-box">
         		    	<div id="region-post-box">
-            
+
 	            	    	<div id="region-main-wrap">
     	            	    	<div id="region-main">
         	            	    	<div class="region-content">
-        	            	          
+
         	            	             <?php if ($hasnavbar) { ?>
         	    							<div class="navbar">
             									<div class="wrapper">
@@ -99,29 +99,29 @@ echo $OUTPUT->doctype() ?>
 	    	        							</div>
     	        							</div>
         								<?php } ?>
-	            	    
+
             	            	    	<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-	                	        	
+
 	                	        	</div>
     	                		</div>
 	    	            	</div>
-                
+
 		                	<?php if ($hassidepost) { ?>
-    
+
     		            	<div id="region-post" class="block-region">
         		            	<div class="region-content">
-    
+
         		             		<?php if ($hasnavbutton) { ?>
 		        		           		<div class="navbutton"><?php echo $PAGE->button; ?></div>
 	        		            	<?php } ?>
-    
+
             		            	<?php echo $OUTPUT->blocks_for_region('side-post') ?>
-            		             
+
                 		    	</div>
 	                		</div>
-	    	          
+
 	    	            	<?php } ?>
-                
+
     	    	    	</div>
 	    	    	</div>
 	    		</div>
@@ -129,7 +129,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF CONTENT -->
 
-	
+
 		</div>
 	</div>
 </div>
diff --git a/theme/canvas/layout/embedded.php b/theme/canvas/layout/embedded.php
index 5d222025429..a5dd7414ed0 100644
--- a/theme/canvas/layout/embedded.php
+++ b/theme/canvas/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/canvas/layout/frontpage.php b/theme/canvas/layout/frontpage.php
index bf4ae45fa0a..812300c025a 100644
--- a/theme/canvas/layout/frontpage.php
+++ b/theme/canvas/layout/frontpage.php
@@ -20,10 +20,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -31,7 +31,7 @@ echo $OUTPUT->doctype() ?>
 <!-- START OF HEADER -->
 
 	<div id="wrapper" class="clearfix">
-   
+
     	<div id="page-header">
 			<div id="page-header-wrapper" class="clearfix">
 	        	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -40,13 +40,13 @@ echo $OUTPUT->doctype() ?>
 	    	    	    echo $OUTPUT->login_info();
     	    	    	echo $OUTPUT->lang_menu();
 	        		    echo $PAGE->headingmenu;
-			        ?>	    
+			        ?>
 		    	</div>
 	    	</div>
 	    </div>
-        
+
         <div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -55,7 +55,7 @@ echo $OUTPUT->doctype() ?>
     		<div id="page-content">
 	    	    <div id="region-main-box">
     	    	    <div id="region-post-box">
-            
+
         	    	    <div id="region-main-wrap">
             	    	    <div id="region-main">
                 	    	    <div class="region-content">
@@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
 	                        	</div>
 		                    </div>
     		            </div>
-                
+
         		        <?php if ($hassidepre) { ?>
             		    <div id="region-pre">
                 		    <div class="region-content">
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
 		                    </div>
     		            </div>
         		        <?php } ?>
-                
+
 	        	        <?php if ($hassidepost) { ?>
     	        	    <div id="region-post">
         	        	    <div class="region-content">
@@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
 	                	    </div>
 		                </div>
     		            <?php } ?>
-                
+
 	        	    </div>
 	    	    </div>
 		    </div>
diff --git a/theme/canvas/layout/general.php b/theme/canvas/layout/general.php
index 532cc2e4873..4ffc0f6c95b 100644
--- a/theme/canvas/layout/general.php
+++ b/theme/canvas/layout/general.php
@@ -22,7 +22,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -66,7 +66,7 @@ echo $OUTPUT->doctype() ?>
             <div id="page-content">
                 <div id="region-main-box">
                     <div id="region-post-box">
-            
+
                         <div id="region-main-wrap">
                             <div id="region-main">
                                 <div class="region-content">
@@ -74,7 +74,7 @@ echo $OUTPUT->doctype() ?>
                                 </div>
                             </div>
                         </div>
-                
+
                         <?php if ($hassidepre) { ?>
                         <div id="region-pre">
                             <div class="region-content">
@@ -82,7 +82,7 @@ echo $OUTPUT->doctype() ?>
                             </div>
                         </div>
                         <?php } ?>
-                
+
                         <?php if ($hassidepost) { ?>
                         <div id="region-post">
                             <div class="region-content">
@@ -90,7 +90,7 @@ echo $OUTPUT->doctype() ?>
                             </div>
                         </div>
                         <?php } ?>
-                
+
                     </div>
                 </div>
             </div>
diff --git a/theme/canvas/layout/report.php b/theme/canvas/layout/report.php
index 49d67890619..7549a2438f4 100644
--- a/theme/canvas/layout/report.php
+++ b/theme/canvas/layout/report.php
@@ -22,7 +22,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -62,7 +62,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- START OF CONTENT -->
 
-        
+
             <div id="page-content-wrapper" class="clearfix">
                 <div id="page-content">
                     <div id="report-main-content">
diff --git a/theme/formal_white/layout/embedded.php b/theme/formal_white/layout/embedded.php
index 7aca05a0149..1fc9be8bb13 100644
--- a/theme/formal_white/layout/embedded.php
+++ b/theme/formal_white/layout/embedded.php
@@ -8,7 +8,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html(); ?>
 
     <div id="page-content">
diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php
index 08d632d4e9d..69eb7d43cc7 100644
--- a/theme/formal_white/layout/frontpage.php
+++ b/theme/formal_white/layout/frontpage.php
@@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
     <?php echo $OUTPUT->standard_top_of_body_html();
 
 if ($hasframe) { ?>
diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php
index b2207560c90..d93c7d0f7e0 100644
--- a/theme/formal_white/layout/general.php
+++ b/theme/formal_white/layout/general.php
@@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
     <?php echo $OUTPUT->standard_top_of_body_html();
 
 if ($hasframe) { ?>
diff --git a/theme/formfactor/layout/embedded.php b/theme/formfactor/layout/embedded.php
index 5d222025429..a5dd7414ed0 100644
--- a/theme/formfactor/layout/embedded.php
+++ b/theme/formfactor/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/formfactor/layout/frontpage.php b/theme/formfactor/layout/frontpage.php
index 58c87cf8aa7..b416319138e 100644
--- a/theme/formfactor/layout/frontpage.php
+++ b/theme/formfactor/layout/frontpage.php
@@ -20,16 +20,16 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
 
 <!-- START OF HEADER -->
-   
+
     <div id="page-header" class="clearfix">
 		<div id="page-header-wrapper">
 	        <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -38,11 +38,11 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
-    
+
     <?php if ($hascustommenu) { ?>
       <div id="custommenu"><?php echo $custommenu; ?></div>
     <?php } else { ?>
@@ -50,7 +50,7 @@ echo $OUTPUT->doctype() ?>
         <li>&nbsp;</li>
       </ul>
   	<?php } ?>
-  	  
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -59,7 +59,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre">
                     <div class="region-content">
@@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post">
                     <div class="region-content">
@@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/formfactor/layout/general.php b/theme/formfactor/layout/general.php
index a0e71f9e6e4..57c57baa311 100644
--- a/theme/formfactor/layout/general.php
+++ b/theme/formfactor/layout/general.php
@@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -34,7 +34,7 @@ echo $OUTPUT->doctype() ?>
 
     <div id="page-header" class="clearfix">
 		<div id="page-header-wrapper">
-	        
+
 	        <?php if ($hasheading) { ?>
 		    	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
     		    <div class="headermenu">
@@ -46,12 +46,12 @@ echo $OUTPUT->doctype() ?>
     			       	echo $PAGE->headingmenu
         			?>
 	        	</div>
-	        <?php } ?>        
-        	
+	        <?php } ?>
+
 	    </div>
     </div>
 
-    <?php if ($hasheading) { ?>	
+    <?php if ($hasheading) { ?>
       <?php if ($hascustommenu) { ?>
         <div id="custommenu"><?php echo $custommenu; ?></div>
       <?php } else { ?>
@@ -60,14 +60,14 @@ echo $OUTPUT->doctype() ?>
         </ul>
       <?php } ?>
 	<?php } ?>
-    
+
     <?php if ($hasnavbar) { ?>
 	    <div class="navbar clearfix">
     	    <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
             <div class="navbutton"> <?php echo $PAGE->button; ?></div>
         </div>
     <?php } ?>
-    
+
 <?php } ?>
 <!-- END OF HEADER -->
 
@@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre">
                     <div class="region-content">
@@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post">
                     <div class="region-content">
@@ -99,7 +99,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/fusion/layout/frontpage.php b/theme/fusion/layout/frontpage.php
index 4657c2ef879..d403f80fd87 100644
--- a/theme/fusion/layout/frontpage.php
+++ b/theme/fusion/layout/frontpage.php
@@ -37,11 +37,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -69,12 +69,12 @@ echo $OUTPUT->doctype() ?>
 					<?php } else { ?>
 						<div id="custommenu" style="line-height:1em;">&nbsp;</div> <!-- temporary until I find a better fix -->
 					<?php } ?>
-			    	
+
 	    		</div>
 
 	    	</div>
 	    </div>
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -83,22 +83,22 @@ echo $OUTPUT->doctype() ?>
 		    <div id="page-content">
     		    <div id="region-main-box">
         		    <div id="region-post-box">
-            
+
             		    <div id="region-main-wrap">
                 		    <div id="region-main">
                     		    <div class="region-content">
-									
+
 									<div id="region-header">
 							    	    <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
 							    	    <p class="tagline"><?php echo $tagline ?></p>
 							    	</div>
-						    	    
+
                         		    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-		                       
+
 		                        </div>
     		                </div>
         		        </div>
-                
+
     	    	        <?php if ($hassidepost) { ?>
         	    	    <div id="region-post" class="block-region">
         	    	    	<div id="region-post-wrap-1">
@@ -110,8 +110,8 @@ echo $OUTPUT->doctype() ?>
 		                	</div>
 		                </div>
     		            <?php } ?>
-    		            
-            		</div>    
+
+            		</div>
         	    </div>
 	        </div>
     	</div>
@@ -135,8 +135,8 @@ echo $OUTPUT->doctype() ?>
    	</div>
 
 <!-- END OF FOOTER -->
-		
-	
+
+
 </div> <!-- END #page -->
 
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
diff --git a/theme/fusion/layout/general.php b/theme/fusion/layout/general.php
index 27f1c76be80..e2ba6ef8591 100644
--- a/theme/fusion/layout/general.php
+++ b/theme/fusion/layout/general.php
@@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -51,15 +51,15 @@ echo $OUTPUT->doctype() ?>
 
 		    	<div id="page-header" class="inside">
 					<div id="page-header-wrapper" class="wrapper clearfix">
-		        
+
 			        	<?php if ($hasheading) { ?>
 				    	    <div id="headermenus" class="clearfix">
 								<div class="headermenu">
 				        			<?php if (!empty($PAGE->layout_options['langmenu'])) {
 	        		    	   			echo $OUTPUT->lang_menu();
 			    			        }
-			    			        echo $OUTPUT->login_info();	
-					            	echo $PAGE->headingmenu 
+			    			        echo $OUTPUT->login_info();
+					            	echo $PAGE->headingmenu
 					        	    ?>
 					        	</div>
 		    				    <?php if ($hascustommenu) { ?>
@@ -69,7 +69,7 @@ echo $OUTPUT->doctype() ?>
 								<?php } ?>
 				            </div>
 		    		    <?php } ?>
-	    	    
+
 			    	</div>
 				</div>
 
@@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
 		    <div id="page-content">
     		    <div id="region-main-box">
         		    <div id="region-post-box">
-            
+
 	            	    <div id="region-main-wrap">
     	            	    <div id="region-main">
         	            	    <div class="region-content">
@@ -105,12 +105,12 @@ echo $OUTPUT->doctype() ?>
 								    	    </div>
 							    	    </div>
 						        	<?php } ?>
-        	            	    
+
             	            	    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
 	                	        </div>
     	                	</div>
 	    	            </div>
-                
+
 		                <?php if ($hassidepost) { ?>
     		            <div id="region-post" class="block-region">
         	    	    	<div id="region-post-wrap-1">
@@ -122,7 +122,7 @@ echo $OUTPUT->doctype() ?>
         		       		</div>
 	                	</div>
 	    	            <?php } ?>
-                
+
     	    	    </div>
 	    	    </div>
 	    	</div>
@@ -136,9 +136,9 @@ echo $OUTPUT->doctype() ?>
 		</div>
 	</div>
 
-		
+
 	<?php } ?>
-	
+
 <!-- START OF FOOTER -->
 
     	<?php if ($hasfooter) { ?>
@@ -152,7 +152,7 @@ echo $OUTPUT->doctype() ?>
 		        ?>
 		    </div>
 	    <?php } ?>
-	    
+
 </div>
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
 </body>
diff --git a/theme/leatherbound/layout/frontpage.php b/theme/leatherbound/layout/frontpage.php
index b492b8fe4b4..55061267dbb 100644
--- a/theme/leatherbound/layout/frontpage.php
+++ b/theme/leatherbound/layout/frontpage.php
@@ -29,11 +29,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -47,11 +47,11 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
-        
+
 <!-- END OF HEADER -->
 
 <?php if ($hascustommenu) { ?>
@@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/leatherbound/layout/general.php b/theme/leatherbound/layout/general.php
index 74d01c1b085..b6d3957442b 100644
--- a/theme/leatherbound/layout/general.php
+++ b/theme/leatherbound/layout/general.php
@@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?>
             <?php } ?>
         </div>
     </div>
-    
+
 <?php if ($hascustommenu) { ?>
 <div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
 <?php } ?>
@@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/leatherbound/layout/report.php b/theme/leatherbound/layout/report.php
index e959c80b66c..7f70c211074 100644
--- a/theme/leatherbound/layout/report.php
+++ b/theme/leatherbound/layout/report.php
@@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/magazine/layout/embedded.php b/theme/magazine/layout/embedded.php
index fa4e8eda673..c4825c5d834 100644
--- a/theme/magazine/layout/embedded.php
+++ b/theme/magazine/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/magazine/layout/frontpage.php b/theme/magazine/layout/frontpage.php
index 163306797e2..46e56b8c68b 100644
--- a/theme/magazine/layout/frontpage.php
+++ b/theme/magazine/layout/frontpage.php
@@ -29,7 +29,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?>
 	<div id="header-wrap">
 		<div id="header-container">
 			<div id="headerinner">
-			
+
 				<div id="headleft">
 				</div>
 				<div id="headright">
-				<?php if ($hasheading) { 
+				<?php if ($hasheading) {
             		echo $OUTPUT->lang_menu();
             		echo $OUTPUT->login_info();
             		echo $PAGE->headingmenu;
             	} ?>
 				</div>
-			
+
 			</div>
 		</div>
 	</div>
@@ -63,8 +63,8 @@ echo $OUTPUT->doctype() ?>
 				</div>
 			</div>
 		<?php } else { ?>
-			
-			
+
+
 			<div id="nologo" <?php if(!$hascustommenu) {echo "class='nomenu'";} ?>>
 				<a href="<?php echo $CFG->wwwroot; ?>" title="Home"><?php echo $PAGE->heading ?></a>
 			</div>
@@ -92,90 +92,90 @@ echo $OUTPUT->doctype() ?>
 		<div id="outercontainer">
 			<div id="container">
 				<div id="innercontainer">
-	
+
 					<div id="jcontrols_button">
 						<div class="jcontrolsleft">
 						<?php if ($hasnavbar) { ?>
         					<div class="navbar clearfix">
             					<div class="breadcrumb"> <?php echo $OUTPUT->navbar();  ?></div>
-            
+
         					</div>
         				<?php } ?>
 						</div>
-	
+
 						<div class="jcontrolsright">
-	  					<?php if ($hasnavbar) { 
-	   						echo $PAGE->button; 
+	  					<?php if ($hasnavbar) {
+	   						echo $PAGE->button;
 	   					} ?>
 						</div>
 					</div>
-	
+
 	<!-- start OF moodle CONTENT -->
 				<div id="page-content">
         			<div id="region-main-box">
             			<div id="region-post-box">
-            
+
                 				<div id="region-main-wrap">
                     				<div id="region-main">
                         				<div class="region-content">
-         
+
                             			<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
                         				</div>
                     				</div>
                 				</div>
-                
+
                 	<?php if ($hassidepre) { ?>
                		<div id="region-pre" class="block-region">
                     	<div class="region-content">
-                   
-        
+
+
                         	<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     	</div>
                 	</div>
                 	<?php } ?>
-                
+
                 	<?php if ($hassidepost) { ?>
                  	<div id="region-post" class="block-region">
                     	<div class="region-content">
-                   
+
                         	<?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     	</div>
                 	</div>
                 	<?php } ?>
-                
+
             			</div>
         			</div>
    				 </div>
-    <!-- END OF CONTENT --> 
-      
+    <!-- END OF CONTENT -->
+
      			 <div id="jcontrols_bottom">
       			</div>
-	
+
 	<!-- Containers end div above clears both -->
 				</div>
 			</div>
-		</div>	
+		</div>
 	</div>
 
 <!-- START OF FOOTER -->
 	<div id="footer-wrap">
 		<div id="footer-container">
 			<div id="footer">
-		
-			 <?php if ($hasfooter) { 
+
+			 <?php if ($hasfooter) {
 		 		echo "<div class='johndocsleft'>";
         		echo $OUTPUT->login_info();
        			echo $OUTPUT->home_link();
         		echo $OUTPUT->standard_footer_html();
         		echo "</div>";
        			} ?>
-         
+
     			<?php if ($hasfooter) { ?>
     			<div class="johndocs">
       				<?php echo page_doc_link(get_string('moodledocslink')) ?>
        			</div>
     			<?php } ?>
-        
+
 			</div>
 		</div>
 	</div>
diff --git a/theme/magazine/layout/general.php b/theme/magazine/layout/general.php
index 9b2bae8d3d6..dfad02ada3e 100644
--- a/theme/magazine/layout/general.php
+++ b/theme/magazine/layout/general.php
@@ -29,7 +29,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -38,20 +38,20 @@ echo $OUTPUT->doctype() ?>
 	<div id="header-wrap">
 		<div id="header-container">
 			<div id="headerinner">
-			
+
 				<div id="headleft">
-					<?php if ($hasheading && !empty($PAGE->theme->settings->logo)) { 
+					<?php if ($hasheading && !empty($PAGE->theme->settings->logo)) {
 					echo $PAGE->heading;
 					} ?>
 				</div>
 				<div id="headright">
-				<?php if ($hasheading) { 
+				<?php if ($hasheading) {
             		echo $OUTPUT->lang_menu();
             		echo $OUTPUT->login_info();
             		echo $PAGE->headingmenu;
             	} ?>
 				</div>
-			
+
 			</div>
 		</div>
 	</div>
@@ -93,90 +93,90 @@ echo $OUTPUT->doctype() ?>
 		<div id="outercontainer">
 			<div id="container">
 				<div id="innercontainer">
-	
+
 					<div id="jcontrols_button">
 						<div class="jcontrolsleft">
 						<?php if ($hasnavbar) { ?>
         					<div class="navbar clearfix">
             					<div class="breadcrumb"> <?php echo $OUTPUT->navbar();  ?></div>
-            
+
         					</div>
         				<?php } ?>
 						</div>
-	
+
 						<div class="jcontrolsright">
-	  					<?php if ($hasnavbar) { 
-	   						echo $PAGE->button; 
+	  					<?php if ($hasnavbar) {
+	   						echo $PAGE->button;
 	   					} ?>
 						</div>
 					</div>
-	
+
 	<!-- start OF moodle CONTENT -->
 				<div id="page-content">
         			<div id="region-main-box">
             			<div id="region-post-box">
-            
+
                 				<div id="region-main-wrap">
                     				<div id="region-main">
                         				<div class="region-content">
-         
+
                             			<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
                         				</div>
                     				</div>
                 				</div>
-                
+
                 	<?php if ($hassidepre) { ?>
                		<div id="region-pre" class="block-region">
                     	<div class="region-content">
-                   
-        
+
+
                         	<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
                     	</div>
                 	</div>
                 	<?php } ?>
-                
+
                 	<?php if ($hassidepost) { ?>
                  	<div id="region-post" class="block-region">
                     	<div class="region-content">
-                   
+
                         	<?php echo $OUTPUT->blocks_for_region('side-post') ?>
                     	</div>
                 	</div>
                 	<?php } ?>
-                
+
             			</div>
         			</div>
    				 </div>
-    <!-- END OF CONTENT --> 
-      
+    <!-- END OF CONTENT -->
+
      			 <div id="jcontrols_bottom">
       			</div>
-	
+
 	<!-- Containers end div above clears both -->
 				</div>
 			</div>
-		</div>	
+		</div>
 	</div>
 
 <!-- START OF FOOTER -->
 	<div id="footer-wrap">
 		<div id="footer-container">
 			<div id="footer">
-		
-			 <?php if ($hasfooter) { 
+
+			 <?php if ($hasfooter) {
 		 		echo "<div class='johndocsleft'>";
         		echo $OUTPUT->login_info();
        			echo $OUTPUT->home_link();
         		echo $OUTPUT->standard_footer_html();
         		echo "</div>";
        			} ?>
-         
+
     			<?php if ($hasfooter) { ?>
     			<div class="johndocs">
       				<?php echo page_doc_link(get_string('moodledocslink')) ?>
        			</div>
     			<?php } ?>
-        
+
 			</div>
 		</div>
 	</div>
diff --git a/theme/nimble/layout/frontpage.php b/theme/nimble/layout/frontpage.php
index ca987b18fa2..f57e7d55a6e 100644
--- a/theme/nimble/layout/frontpage.php
+++ b/theme/nimble/layout/frontpage.php
@@ -37,11 +37,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -71,12 +71,12 @@ echo $OUTPUT->doctype() ?>
 	    		        	echo $OUTPUT->lang_menu();
 			    	    ?>
 			    	</div>
-			    	
+
 	    		</div>
 
 	    	</div>
 	    </div>
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -85,22 +85,22 @@ echo $OUTPUT->doctype() ?>
 		    <div id="page-content">
     		    <div id="region-main-box">
         		    <div id="region-post-box">
-            
+
             		    <div id="region-main-wrap">
                 		    <div id="region-main">
                     		    <div class="region-content">
-									
+
 									<div id="region-header" class="clearfix">
 							    	    <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
 							    	    <p class="tagline"><?php echo $tagline ?></p>
 							    	</div>
-						    	    
+
                         		    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-		                       
+
 		                        </div>
     		                </div>
         		        </div>
-                
+
     	    	        <?php if ($hassidepost) { ?>
         	    	    <div id="region-post" class="block-region">
         	    	    	<div id="region-post-wrap-1">
@@ -112,8 +112,8 @@ echo $OUTPUT->doctype() ?>
 		                	</div>
 		                </div>
     		            <?php } ?>
-    		            
-            		</div>    
+
+            		</div>
         	    </div>
 	        </div>
     	</div>
@@ -137,8 +137,8 @@ echo $OUTPUT->doctype() ?>
    	</div>
 
 <!-- END OF FOOTER -->
-		
-	
+
+
 </div> <!-- END #page -->
 
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
diff --git a/theme/nimble/layout/general.php b/theme/nimble/layout/general.php
index 7cb973ba892..cae203a96e0 100644
--- a/theme/nimble/layout/general.php
+++ b/theme/nimble/layout/general.php
@@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -51,7 +51,7 @@ echo $OUTPUT->doctype() ?>
 
 		    	<div id="page-header" class="inside">
 					<div id="page-header-wrapper" class="wrapper clearfix">
-		        
+
 			        	<?php if ($hasheading) { ?>
 				    	    <div id="headermenus" class="shrinkwrapper clearfix">
 		    				    <?php if ($hascustommenu) { ?>
@@ -64,13 +64,13 @@ echo $OUTPUT->doctype() ?>
 				        			<?php if (!empty($PAGE->layout_options['langmenu'])) {
 	        		    	   			echo $OUTPUT->lang_menu();
 			    			        }
-			    			        echo $OUTPUT->login_info();	
-					            	echo $PAGE->headingmenu 
+			    			        echo $OUTPUT->login_info();
+					            	echo $PAGE->headingmenu
 					        	    ?>
 					        	</div>
 				            </div>
 		    		    <?php } ?>
-	    	    
+
 			    	</div>
 				</div>
 
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
 		    <div id="page-content">
     		    <div id="region-main-box">
         		    <div id="region-post-box">
-            
+
 	            	    <div id="region-main-wrap">
     	            	    <div id="region-main">
         	            	    <div class="region-content">
@@ -106,12 +106,12 @@ echo $OUTPUT->doctype() ?>
 								    	    </div>
 							    	    </div>
 						        	<?php } ?>
-        	            	    
+
             	            	    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
 	                	        </div>
     	                	</div>
 	    	            </div>
-                
+
 		                <?php if ($hassidepost) { ?>
     		            <div id="region-post" class="block-region">
         	    	    	<div id="region-post-wrap-1">
@@ -123,7 +123,7 @@ echo $OUTPUT->doctype() ?>
         		       		</div>
 	                	</div>
 	    	            <?php } ?>
-                
+
     	    	    </div>
 	    	    </div>
 	    	</div>
@@ -137,9 +137,9 @@ echo $OUTPUT->doctype() ?>
 		</div>
 	</div>
 
-		
+
 	<?php } ?>
-	
+
 <!-- START OF FOOTER -->
 
     	<?php if ($hasfooter) { ?>
@@ -153,7 +153,7 @@ echo $OUTPUT->doctype() ?>
 		        ?>
 		    </div>
 	    <?php } ?>
-	    
+
 </div>
 <?php echo $OUTPUT->standard_end_of_body_html() ?>
 </body>
diff --git a/theme/nonzero/layout/frontpage.php b/theme/nonzero/layout/frontpage.php
index 7fdcfc9b233..9da35f2320e 100644
--- a/theme/nonzero/layout/frontpage.php
+++ b/theme/nonzero/layout/frontpage.php
@@ -31,11 +31,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -49,15 +49,15 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    	<?php if ($hascustommenu) { ?>
 <div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
 <?php } ?>
 	    </div>
-	    
+
     </div>
-        
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
 	    <div id="page-content">
     	    <div id="region-main-box">
         	    <div id="region-post-box">
-            
+
             	    <div id="region-main-wrap">
                 	    <div id="region-main">
                     	    <div class="region-content">
@@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
 	                        </div>
     	                </div>
         	        </div>
-                
+
             	    <?php if ($hassidepre) { ?>
 	                <div id="region-pre" class="block-region">
     	                <div class="region-content">
@@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
             	        </div>
                 	</div>
 	                <?php } ?>
-                
+
     	            <?php if ($hassidepost) { ?>
         	        <div id="region-post" class="block-region">
             	        <div class="region-content">
@@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
                     	</div>
 	                </div>
     	            <?php } ?>
-                
+
         	    </div>
 	        </div>
     	</div>
diff --git a/theme/nonzero/layout/general.php b/theme/nonzero/layout/general.php
index ea063834de1..3f2013f72e8 100644
--- a/theme/nonzero/layout/general.php
+++ b/theme/nonzero/layout/general.php
@@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?>
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
 	    <div id="page-content">
     	    <div id="region-main-box">
         	    <div id="region-post-box">
-            
+
 	                <div id="region-main-wrap">
     	                <div id="region-main">
         	                <div class="region-content">
@@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
                 	        </div>
                     	</div>
 	                </div>
-                
+
 	                <?php if ($hassidepre) { ?>
     	            <div id="region-pre" class="block-region">
         	            <div class="region-content">
@@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
                 	    </div>
 	                </div>
     	            <?php } ?>
-                
+
 	                <?php if ($hassidepost) { ?>
     	            <div id="region-post" class="block-region">
         	            <div class="region-content">
@@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
                 	    </div>
 	                </div>
     	            <?php } ?>
-                
+
         	    </div>
 	        </div>
     	</div>
diff --git a/theme/overlay/layout/frontpage.php b/theme/overlay/layout/frontpage.php
index 0e8a6173ac4..6adb5eb83ce 100644
--- a/theme/overlay/layout/frontpage.php
+++ b/theme/overlay/layout/frontpage.php
@@ -33,11 +33,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
@@ -67,24 +67,24 @@ echo $OUTPUT->doctype() ?>
 	    <div id="page-content">
     	    <div id="region-main-box">
         	    <div id="region-post-box">
-        
+
             	    <div id="region-main-wrap">
-                	   
+
                 	    <div id="region-main">
                     	    <div id="newheader">
                     	    	<div id="newheaderleft"></div>
                     	    	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
-                    	    	
-                    	    </div>                    	    
+
+                    	    </div>
                     	    <div class="region-content">
-                    	    
-                    	    
-                    	    
+
+
+
                         	    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
 	                        </div>
     	                </div>
         	        </div>
-                
+
             	    <?php if ($hassidepre) { ?>
 	                <div id="region-pre" class="block-region">
     	                <div class="region-content">
@@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
             	        </div>
                 	</div>
 	                <?php } ?>
-                
+
     	            <?php if ($hassidepost) { ?>
         	        <div id="region-post" class="block-region">
             	        <div class="region-content">
@@ -100,7 +100,7 @@ echo $OUTPUT->doctype() ?>
                     	</div>
 	                </div>
     	            <?php } ?>
-                
+
         	    </div>
 	        </div>
     	</div>
@@ -117,7 +117,7 @@ echo $OUTPUT->doctype() ?>
         <p class="helplink">
         <?php echo page_doc_link(get_string('moodledocslink')) ?>
         </p>
-        
+
         <?php echo $footnote ?>
 
         <?php
diff --git a/theme/overlay/layout/general.php b/theme/overlay/layout/general.php
index 52231fb0de4..1a78ca32857 100644
--- a/theme/overlay/layout/general.php
+++ b/theme/overlay/layout/general.php
@@ -33,11 +33,11 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
 
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
@@ -67,9 +67,9 @@ echo $OUTPUT->doctype() ?>
 	    <div id="page-content">
     	    <div id="region-main-box">
         	    <div id="region-post-box">
-        
+
             	    <div id="region-main-wrap">
-                	   
+
                 	    <div id="region-main">
                     	    <div id="newheader">
                     	    	<div id="newheaderleft"></div>
@@ -77,27 +77,27 @@ echo $OUTPUT->doctype() ?>
                     	    	 <?php if ($hasnavbar) { ?>
                     	    	<div class="navbutton"> <?php echo $PAGE->button; ?></div>
                     	    	 <?php } ?>
-                    	    	
+
                     	    </div>
-                    	    
+
                     	     <?php if ($hasnavbar) { ?>
             <div class="navbar">
             	<div class="wrapper clearfix">
 	                <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
-    	            
+
     	        </div>
             </div>
         <?php } ?>
-                    	    
+
                     	    <div class="region-content">
-                    	    
-                    	    
-                    	    
+
+
+
                         	    <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
 	                        </div>
     	                </div>
         	        </div>
-                
+
             	    <?php if ($hassidepre) { ?>
 	                <div id="region-pre" class="block-region">
     	                <div class="region-content">
@@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?>
             	        </div>
                 	</div>
 	                <?php } ?>
-                
+
     	            <?php if ($hassidepost) { ?>
         	        <div id="region-post" class="block-region">
             	        <div class="region-content">
@@ -113,7 +113,7 @@ echo $OUTPUT->doctype() ?>
                     	</div>
 	                </div>
     	            <?php } ?>
-                
+
         	    </div>
 	        </div>
     	</div>
@@ -130,9 +130,9 @@ echo $OUTPUT->doctype() ?>
         <p class="helplink">
         <?php echo page_doc_link(get_string('moodledocslink')) ?>
         </p>
-		
+
 		<?php echo $footnote ?>
-		
+
         <?php
         echo $OUTPUT->login_info();
         echo $OUTPUT->home_link();
diff --git a/theme/serenity/layout/embedded.php b/theme/serenity/layout/embedded.php
index 5d222025429..a5dd7414ed0 100644
--- a/theme/serenity/layout/embedded.php
+++ b/theme/serenity/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/serenity/layout/frontpage.php b/theme/serenity/layout/frontpage.php
index 5156de9f424..12e94f90fa5 100644
--- a/theme/serenity/layout/frontpage.php
+++ b/theme/serenity/layout/frontpage.php
@@ -2,7 +2,7 @@
 
 $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
 $hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
-	
+
 $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
 $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
 
@@ -23,17 +23,17 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
 	<div id="wrapper" class="clearfix">
-	
+
 <!-- START OF HEADER -->
-   
+
     <div id="page-header" class="clearfix">
 		<div id="page-header-wrapper">
 	        <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -42,11 +42,11 @@ echo $OUTPUT->doctype() ?>
 	        	    echo $OUTPUT->login_info();
     	        	echo $OUTPUT->lang_menu();
 	        	    echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
-      	  
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -55,7 +55,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/serenity/layout/general.php b/theme/serenity/layout/general.php
index aa79557947c..367f4d95b2c 100644
--- a/theme/serenity/layout/general.php
+++ b/theme/serenity/layout/general.php
@@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
@@ -33,7 +33,7 @@ echo $OUTPUT->doctype() ?>
 <?php if ($hasheading || $hasnavbar) { ?>
 
     <div id="page-header" class="clearfix">
-	        
+
 	        <?php if ($hasheading) { ?>
 		    	<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
     		    <div class="headermenu">
@@ -45,17 +45,17 @@ echo $OUTPUT->doctype() ?>
     			       	echo $PAGE->headingmenu
         			?>
 	        	</div>
-	        <?php } ?>        
-        	
+	        <?php } ?>
+
     </div>
-    
+
     <?php if ($hasnavbar) { ?>
 	    <div class="navbar clearfix">
     	    <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
             <div class="navbutton"> <?php echo $PAGE->button; ?></div>
       </div>
     <?php } ?>
-    
+
 <?php } ?>
 
 <!-- END OF HEADER -->
@@ -64,7 +64,7 @@ echo $OUTPUT->doctype() ?>
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -72,7 +72,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -80,7 +80,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -88,7 +88,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
diff --git a/theme/sky_high/layout/frontpage.php b/theme/sky_high/layout/frontpage.php
index 0dbe3cc0787..7d2e3a7ba82 100644
--- a/theme/sky_high/layout/frontpage.php
+++ b/theme/sky_high/layout/frontpage.php
@@ -2,7 +2,7 @@
 
 $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
 $hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
-	
+
 $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
 $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
 
@@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
 	<div id="wrapper" class="clearfix">
-	
+
 <!-- START OF HEADER -->
-   
+
     <div id="page-header" class="clearfix">
 		<div id="page-header-wrapper">
 			<?php if($logourl == NULL) { ?>
@@ -58,30 +58,30 @@ echo $OUTPUT->doctype() ?>
 	        <?php } else { ?>
 	        <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" />
 	        <?php } ?>
-	      
-	        
+
+
     	    <div class="headermenu">
         		<?php
 	        	    echo $OUTPUT->login_info();
             			echo $OUTPUT->lang_menu();
           			echo $PAGE->headingmenu;
-		        ?>	    
+		        ?>
 	    	</div>
 	    </div>
     </div>
-      	  
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
 <?php if ($hascustommenu) { ?>
       <div id="custommenu"><?php echo $custommenu; ?></div>
 <?php } ?>
-  	
+
 <div id="page-content-wrapper">
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -89,7 +89,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -97,7 +97,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
@@ -113,7 +113,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF CONTENT -->
 
-	
+
 
 <!-- START OF FOOTER -->
 
@@ -131,7 +131,7 @@ echo $OUTPUT->doctype() ?>
 	<p class="helplink">
         <?php echo page_doc_link(get_string('moodledocslink')) ?>
     </p><center>
-        <?php 
+        <?php
 	echo $OUTPUT->home_link();
 	echo $OUTPUT->standard_end_of_body_html() ?>
 </center>
diff --git a/theme/sky_high/layout/general.php b/theme/sky_high/layout/general.php
index e8116f705dc..d26b6fe417a 100644
--- a/theme/sky_high/layout/general.php
+++ b/theme/sky_high/layout/general.php
@@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
 	<div id="wrapper" class="clearfix">
-	
+
 <!-- START OF HEADER -->
-   
+
     <div id="page-header" class="clearfix">
 		<div id="page-header-wrapper">
 			<?php if($logourl == NULL) { ?>
@@ -58,8 +58,8 @@ echo $OUTPUT->doctype() ?>
 	        <?php } else { ?>
 	       <img class="logo" src="<?php echo $logourl;?>" alt="Custom logo here" /><h1 class="headerwlogo">- <?php echo $PAGE->heading ?></h1>
 	        <?php } ?>
-	      
-	        
+
+
     	    <div class="headermenu">
         		<?php
             			echo $OUTPUT->login_info();
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
 	    	</div>
 	    </div>
     </div>
-      	  
+
 <!-- END OF HEADER -->
 
 <!-- START OF CONTENT -->
@@ -85,14 +85,14 @@ echo $OUTPUT->doctype() ?>
             <?php } ?>
       </div>
 
-  	
-  	
-  	
+
+
+
 <div id="page-content-wrapper">
     <div id="page-content">
         <div id="region-main-box">
             <div id="region-post-box">
-            
+
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
@@ -100,7 +100,7 @@ echo $OUTPUT->doctype() ?>
                         </div>
                     </div>
                 </div>
-                
+
                 <?php if ($hassidepre) { ?>
                 <div id="region-pre" class="block-region">
                     <div class="region-content">
@@ -108,7 +108,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
                 <?php if ($hassidepost) { ?>
                 <div id="region-post" class="block-region">
                     <div class="region-content">
@@ -116,7 +116,7 @@ echo $OUTPUT->doctype() ?>
                     </div>
                 </div>
                 <?php } ?>
-                
+
             </div>
         </div>
     </div>
@@ -124,7 +124,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF CONTENT -->
 
-	
+
 
 <!-- START OF FOOTER -->
 
@@ -142,7 +142,7 @@ echo $OUTPUT->doctype() ?>
 	<p class="helplink">
         <?php echo page_doc_link(get_string('moodledocslink')) ?>
     </p><center>
-        <?php 
+        <?php
 	echo $OUTPUT->home_link();
 	echo $OUTPUT->standard_end_of_body_html() ?>
 </center>
diff --git a/theme/sky_high/layout/report.php b/theme/sky_high/layout/report.php
index 3bd42c8571f..9c8427fac51 100644
--- a/theme/sky_high/layout/report.php
+++ b/theme/sky_high/layout/report.php
@@ -32,10 +32,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php
index 09da6af83a5..d17190e7e28 100644
--- a/theme/splash/layout/general.php
+++ b/theme/splash/layout/general.php
@@ -37,10 +37,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
     <?php echo $OUTPUT->standard_top_of_body_html() ?>
     <div id="page">
         <?php if ($hasheading || $hasnavbar) { ?>
diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php
index dad56b6f559..ff92748c646 100644
--- a/theme/splash/layout/report.php
+++ b/theme/splash/layout/report.php
@@ -32,10 +32,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
     <?php echo $OUTPUT->standard_top_of_body_html() ?>
     <div id="page">
         <?php if ($hasheading || $hasnavbar) { ?>
diff --git a/theme/standardold/layout/embedded.php b/theme/standardold/layout/embedded.php
index 5d222025429..a5dd7414ed0 100644
--- a/theme/standardold/layout/embedded.php
+++ b/theme/standardold/layout/embedded.php
@@ -5,7 +5,7 @@
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/standardold/layout/frontpage.php b/theme/standardold/layout/frontpage.php
index dbd89d0bac7..857f9007e79 100644
--- a/theme/standardold/layout/frontpage.php
+++ b/theme/standardold/layout/frontpage.php
@@ -25,10 +25,10 @@ echo $OUTPUT->doctype() ?>
 <head>
     <title><?php echo $PAGE->title ?></title>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
-    <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+    <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
diff --git a/theme/standardold/layout/general.php b/theme/standardold/layout/general.php
index 79bee9905a8..bac2689ed57 100644
--- a/theme/standardold/layout/general.php
+++ b/theme/standardold/layout/general.php
@@ -31,7 +31,7 @@ echo $OUTPUT->doctype() ?>
     <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
     <?php echo $OUTPUT->standard_head_html() ?>
 </head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 <div id="page">
 <?php if ($hasheading || $hasnavbar) { ?>