Changeset 852

Timestamp:

Jan 17, 2016, 10:25:29 PM (9 years ago)

Author:

chronos

Message:

• Fixed: HTML entities need to be converted before BB code is applied as BB parser itself produce HTML code.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Forum/Forum.php (modified) (5 diffs)
• Modules/User/Profile.php (modified) (1 diff)

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 851; // Subversion revision
+$Revision = 852; // Subversion revision
 $DatabaseRevision = 849; // Database structure revision
 $ReleaseTime = '2016-01-17';

trunk/Modules/Forum/Forum.php

@@ -57 +57 @@
         '<td><a href="'.$this->System->Link('/forum/?Thread='.$DbRow['Thread']).'">'.HumanDate($DbRow['Date']).'</a></td>'.
         '<td><a href="'.$this->System->Link('/user/?user='.$DbRow['UserId']).'">'.$DbRow['UserName'].'</a></td>'.
-        '<td>'.htmlspecialchars($Parser->qparse($DbRow['Text'])).'</td>'.
+        '<td>'.$Parser->qparse(htmlspecialchars($DbRow['Text'])).'</td>'.
         '</tr>';
     }
@@ -152 +152 @@
       $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.
       htmlspecialchars($Line['ThreadName']).'</a><br /><strong>'.$Line['UserName'].
-      '</strong> ('.HumanDate($Line['Date']).'): '.htmlspecialchars($parser->qparse($Line['Text'])).'</div> ';
+      '</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse(htmlspecialchars($Line['Text'])).'</div> ';
     $Output .= '</div>'.$PageList['Output'];
     return($Output);
@@ -181 +181 @@
 
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-  //  echo $parser->qparse('[youtube]http://www.youtube.com/watch?v=hwgO6p2Jh-A[/youtube][img]http://www.bbcode.org/images/lubeck_small.jpg[/img]normal [i][b]bold[/b][/i] [img]http://imageshack.com/a/img203/7462/6ctg.jpg[/img]  and normal again');
 
     if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
@@ -212 +211 @@
       $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).
         ')</span><strong>'.$Line['UserName'].'</strong>: '.str_replace("\n", '<br />',
-        htmlspecialchars($parser->qparse($Line['Text']))).'  </div> ';
+        $parser->qparse(htmlspecialchars($Line['Text']))).'  </div> ';
     }
     $Output .= '</div>'.$PageList['Output'];
@@ -321 +320 @@
         'Title' => htmlspecialchars($DbRow['ThreadText']).' - '.$DbRow['UserName'].': ',
         'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/?Thread='.$DbRow['Thread']),
-        'Description' => htmlspecialchars($parser->qparse($DbRow['Text'])),
+        'Description' => $parser->qparse(htmlspecialchars($DbRow['Text'])),
         'Time' => $DbRow['UnixDate'],
       );

trunk/Modules/User/Profile.php

@@ -132 +132 @@
     while($Line = $DbResult->fetch_assoc())
       $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.htmlspecialchars($Line['ThreadName']).'</a><br />'.
-        '<strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.htmlspecialchars($parser->qparse($Line['Text'])).'</div> ';
+        '<strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse(htmlspecialchars($Line['Text'])).'</div> ';
     $Output .= '</div>';
     return($Output);