Fixed some text formatting issues. 6.x-1.x 6.x-1.4
authorMark Ferree
Wed, 23 Jan 2013 05:09:42 +0000 (21:09 -0800)
committerMark Ferree
Wed, 23 Jan 2013 05:09:42 +0000 (21:09 -0800)
user_relationship_defaults/user_relationship_defaults.module
user_relationship_implications/user_relationship_implications.module
user_relationships_ui/templates/user_relationships.tpl.php
user_relationships_ui/user_relationships_ui.pages.inc

index 16b5fd7..7616f54 100644 (file)
@@ -253,7 +253,7 @@ function user_relationship_defaults_user_relationships_page_alter($page_id, &$pa
     foreach ($defaults as $default) {
       $default_rows[] = array(
         theme('username', $default->user),
-        $default->relationship_type->name,
+        check_plain($default->relationship_type->name),
         l(t('delete'), "admin/user/relationships/defaults/{$default->rdid}/delete"),
       );
     }
index c215f69..fab4eb6 100644 (file)
@@ -269,7 +269,7 @@ function user_relationship_implications_user_relationships_page_alter($page_id,
       $names = array();
       foreach ($rtype->implies as $implied_rtid => $implication) {
         $implied = user_relationships_type_load($implied_rtid);
-        $names[] = $implied->name;
+        $names[] = check_plain($implied->name);
       }
       $table['rows'][$key][2] = implode(', ', $names);
     }
index 58abf9b..f64d099 100644 (file)
@@ -15,7 +15,7 @@ if ($relationships) {
     }
     $row = array(
       theme('username', $this_user),
-      ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($this_user_str == 'requestee' ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+      check_plain(ur_tt("user_relationships:rtid:$relationship->rtid:name", $relationship->name)) . ($relationship->is_oneway ? ($this_user_str == 'requestee' ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
       $extra,
       $edit_access ? theme('user_relationships_remove_link', $account->uid, $relationship->rid) : ' ',
     );
index 8a52df9..3d22e6d 100644 (file)
@@ -17,8 +17,8 @@ function user_relationships_ui_types_list_page() {
   foreach ($relationship_types as $relationship) {
     $table['data'][] = $relationship;
     $table['rows'][] = array(
-      $relationship->name,
-      $relationship->plural_name,
+      check_plain($relationship->name),
+      check_plain($relationship->plural_name),
       ($relationship->is_oneway ? ($relationship->is_reciprocal ? t('reciprocal') : t('one way')) : t('mutual')),
       ($relationship->requires_approval ? t('yes') : t('no')),
       ($relationship->expires_val ? t('@expires_val', array('@expires_val' => format_plural($relationship->expires_val, '1 day', '@count days'))) : t('Never')),