Merge pull request DoSomethingArchive#4287 from angaither/reportback-…

…ampersands Reportback &-persands
cjcodes · Mar 24, 2015 · a5d574b · a5d574b
2 parents 3cc02ae + 45b6268
commit a5d574b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/lib/modules/dosomething/dosomething_reportback/includes/dosomething_reportback_file.inc b/lib/modules/dosomething/dosomething_reportback/includes/dosomething_reportback_file.inc
@@ -104,7 +104,7 @@ class ReportbackFileEntityController extends EntityAPIController {
 
     $build['caption'] = array(
       '#prefix' => '<p><strong>',
-      '#markup' => check_plain($entity->caption),
+      '#markup' => filter_xss($entity->caption),
       '#suffix' => '</strong></p>',
     );
 
@@ -143,7 +143,7 @@ class ReportbackFileEntityController extends EntityAPIController {
 
       $build['why'] = array(
         '#prefix' => '<p>',
-        '#markup' => check_plain($reportback->why_participated),
+        '#markup' => filter_xss($reportback->why_participated),
         '#suffix' => '</p>',
       );
     }

diff --git a/lib/modules/dosomething/dosomething_reportback/theme/reportback-latest-submission.tpl.php b/lib/modules/dosomething/dosomething_reportback/theme/reportback-latest-submission.tpl.php
@@ -1,5 +1,5 @@
 <?php print $reportback->image; ?>
 
 <?php if ($reportback->caption): ?>
-  <?php print $reportback->caption; ?>
+  <?php print filter_xss($reportback->caption); ?>
 <?php endif; ?>
diff --git a/...themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign--closed.tpl.php b/...themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign--closed.tpl.php
@@ -120,7 +120,7 @@
                     <h3><?php print check_plain($reportback_gallery_item['first_name']); ?></h3>
                   <?php endif; ?>
                   <?php if (isset($reportback_gallery_item['caption'])): ?>
-                    <?php print check_plain($reportback_gallery_item['caption']); ?>
+                    <?php print filter_xss($reportback_gallery_item['caption']); ?>
                   <?php endif; ?>
                 </div>
               </div>

diff --git a/...osomething/paraneue_dosomething/templates/reportback/reportback-latest-submission.tpl.php b/...osomething/paraneue_dosomething/templates/reportback/reportback-latest-submission.tpl.php
@@ -3,7 +3,7 @@
 
   <?php if ($reportback->caption): ?>
     <figcaption class="reportback__submission__copy">
-      <?php print check_plain($reportback->caption); ?>
+      <?php print filter_xss($reportback->caption); ?>
     </figcaption>
   <?php endif; ?>
 </figure>
diff --git a/...themes/dosomething/paraneue_dosomething/templates/reportback/reportback-permalink.tpl.php b/...themes/dosomething/paraneue_dosomething/templates/reportback/reportback-permalink.tpl.php
@@ -36,7 +36,7 @@
           <?php print $rb['image']; ?>
           <?php if ($rb['caption']): ?>
             <div class="caption">
-              <?php print check_plain($rb['caption']); ?> - <?php print check_plain($user->first_name); ?>
+              <?php print filter_xss($rb['caption']); ?> - <?php print check_plain($user->first_name); ?>
             </div>
           <?php endif; ?>
         </div>
@@ -63,11 +63,11 @@
               <h3><?php print $copy_vars['owners_rb_important']; ?></h3>
 
               <?php if ($why_participated_short): ?>
-                <p class="participate is-shown"><?php print check_plain($why_participated_short); ?></p>
-                <p class="participate"><?php print check_plain($reportback->why_participated); ?></p>
+                <p class="participate is-shown"><?php print filter_xss($why_participated_short); ?></p>
+                <p class="participate"><?php print filter_xss($reportback->why_participated); ?></p>
                 <p><a href="#" class="js-permalink-show-more secondary">Show More</a></p>
               <?php else: ?>
-                <p><?php print check_plain($reportback->why_participated); ?></p>
+                <p><?php print filter_xss($reportback->why_participated); ?></p>
               <?php endif; ?>
             </div>
           <!--Show non-owner the call to action page -->

diff --git a/lib/themes/dosomething/paraneue_dosomething/templates/system/patterns/photo.tpl.php b/lib/themes/dosomething/paraneue_dosomething/templates/system/patterns/photo.tpl.php
@@ -4,8 +4,8 @@
       <a class="button -secondary" href="<?php print $content['admin_link']; ?>">Edit Status</a>
     </div>
   <?php endif; ?>
-  <img src="<?php print $content['image']; ?>" alt="<?php print check_plain($content['caption']); ?>" />
+  <img src="<?php print $content['image']; ?>" alt="<?php print filter_xss($content['caption']); ?>" />
   <figcaption class="__copy">
-    <?php print check_plain($content['caption']); ?>
+    <?php print filter_xss($content['caption']); ?>
   </figcaption>
 </figure>