merge work

loadedcommerce · Aug 31, 2015 · b0c85cc · b0c85cc
1 parent ab31ea6
commit b0c85cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/catalog/includes/classes/database.php b/catalog/includes/classes/database.php
@@ -412,9 +412,7 @@ public function bindReplace($place_holder, $value) {
     if ($pos !== false) {
       $length = strlen($place_holder);
       $character_after_place_holder = substr($this->sql_query, $pos+$length, 1);
-      if (strstr($value,':') && (strlen($value) - strpos($value,':') > 3)) {
-        $value = str_replace(':','&#x3a;',$value);
-      }
+
       if (($character_after_place_holder === false) || preg_match('/[ ,)"]/', $character_after_place_holder)) {
         $this->sql_query = substr_replace($this->sql_query, $value, $pos, $length);
       }
@@ -825,4 +823,4 @@ public function getBatchNextPageLink($batch_keyword = 'page', $parameters = '')
     return $string;
   }
 }
-?>
+?>
diff --git a/catalog/includes/functions/general.php b/catalog/includes/functions/general.php
@@ -619,10 +619,7 @@ function lc_nl2p($string, $line_breaks = true, $xml = true){
      // It is conceivable that people might still want single line-breaks
      // without breaking into a new paragraph.
      if ($line_breaks == true){
-     	$data_string = str_replace("\n\n", "</p><p>", trim($string));
-     	$data_string = str_replace("\n", "<br>", trim($data_string));
-     	$data_string = str_replace("</p><p>", "</p>\n<p>", trim($data_string));
-     	return '<p>'.$data_string.'</p>';
+       return '<p>'.preg_replace(array("/([\n]{2,})/i", "/([^>])\n([^<])/i"), array("</p>\n<p>", '<br'.($xml == true ? ' /' : '').'>'), trim($string)).'</p>';
      } else {
        return '<p>'.preg_replace("/([\n]{1,})/i", "</p>\n<p>", trim($string)).'</p>';
      }

diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt
@@ -1 +1 @@
-7.003.4.2|08/19/2015
+7.003.4.2|08/31/2015
diff --git a/catalog/templates/core/content/products/info.php b/catalog/templates/core/content/products/info.php
@@ -123,10 +123,8 @@ function social_popup(url){
         </div>
         <?php
       }
+      ?>
 
-       // check if reviews service is active
-       if(isset($lC_Services) && $lC_Services->isStarted('reviews')){
-      ?>      
       <div class="content-products-info-reviews-container large-margin-bottom">
       <?php if ( SERVICE_REVIEW_HIDE_REVIEWS_RATING == 'No' ) { ?>
         <label class="content-products-info-reviews-rating-label with-padding-no-top-bottom"><?php echo $lC_Language->get('average_rating'); ?></label>
@@ -142,7 +140,6 @@ function social_popup(url){
         ?>      
       </div>  
       <?php
-       }// reviews service check
       if ( $lC_Product->hasVariants() ) {
         ?>
         <div id="content-products-info-variants-container">