diff --git a/catalog/includes/classes/database.php b/catalog/includes/classes/database.php index 542653735..f843837ad 100644 --- 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(':',':',$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; } } -?> +?> \ No newline at end of file diff --git a/catalog/includes/functions/general.php b/catalog/includes/functions/general.php index ec4858af2..031f3cc6e 100644 --- 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", "
", trim($string));
- $data_string = str_replace("\n", "
", trim($data_string));
- $data_string = str_replace("
", "
\n", trim($data_string)); - return '
'.$data_string.'
'; + return ''.preg_replace(array("/([\n]{2,})/i", "/([^>])\n([^<])/i"), array("
\n", '
'), trim($string)).'
'.preg_replace("/([\n]{1,})/i", "
\n", trim($string)).'
'; } diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt index f0a78c626..1f00ce4c2 100644 --- 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 index d8209e071..b68584944 100644 --- a/catalog/templates/core/content/products/info.php +++ b/catalog/templates/core/content/products/info.php @@ -123,10 +123,8 @@ function social_popup(url){ - // check if reviews service is active - if(isset($lC_Services) && $lC_Services->isStarted('reviews')){ - ?>