Escape each time instead of redefining it

Author: Thai Wood

inline-gdocs-viewer.php

@@ -592,8 +592,7 @@ private function dataToHtml ($r, $options, $caption = '') {
         $id = ( 0 === $this->invocations )
             ? 'igsv-' . $this->getDocId( $options['key'] )
             : "igsv-{$this->invocations}-" . $this->getDocId( $options['key'] );
-        $id = esc_attr( $id );
-        $html  = '<table id="$id"';
+        $html  = '<table id="' . esc_attr( $id ) . '"';
         // Prepend a space character onto the 'class' value, if one exists.
         if ( ! empty( $options['class'] ) ) {
             $options['class'] = " {$options['class']}";
@@ -614,7 +613,7 @@ private function dataToHtml ($r, $options, $caption = '') {
 
         $html .= "<thead>\n";
         foreach ( $thead as $v ) {
-            $html .= "<tr id=\"$id-row-$ir\" class=\"row-$ir " . $this->evenOrOdd( $ir ) . "\">";
+            $html .= "<tr id=\"" . esc_attr( $id ) . '-row-$ir" class="row-$ir ' . $this->evenOrOdd( $ir ) . "\">";
             $ir++;
             $ic = 1; // reset column counting
             foreach ( $v as $th ) {
@@ -629,7 +628,7 @@ private function dataToHtml ($r, $options, $caption = '') {
         if ( $tfoot ) {
             $html .= "<tfoot>\n";
             foreach ( $tfoot as $v ) {
-                $html .= "<tr id=\"$id-row-$ir\" class=\"row-$ir " . $this->evenOrOdd( $ir ) . "\">";
+                $html .= "<tr id=\"" . esc_attr( $id ) . "-row-$ir\" class=\"row-$ir " . $this->evenOrOdd( $ir ) . "\">";
                 $ir++;
                 $ic = 1; // reset column counting
                 foreach ( $v as $td ) {
@@ -645,7 +644,7 @@ private function dataToHtml ($r, $options, $caption = '') {
 
         $html .= "<tbody>\n";
         foreach ( $tbody as $v ) {
-            $html .= "<tr id=\"$id-row-$ir\" class=\"row-$ir " . $this->evenOrOdd( $ir ) . "\">";
+            $html .= "<tr id=\"" . esc_attr( $id ) . "-row-$ir\" class=\"row-$ir " . $this->evenOrOdd( $ir ) . "\">";
             $ir++;
             $ic = 1; // reset column counting
             foreach ( $v as $td ) {