Minor search results bug fixes, a=chris
Minor search results bug fixes, a=chris
diff --git a/models/model.php b/models/model.php
index bb62f54b6..537958a4f 100755
--- a/models/model.php
+++ b/models/model.php
@@ -248,7 +248,7 @@ class Model implements CrawlConstants
{
$words = array_unique($words);
foreach($words as $word) {
- if($word != "") {
+ if($word != "" && !stristr($word, "/")) {
$pattern = '/('.$word.')/i';
$new_text = preg_replace($pattern, '<b>$1</b>', $text);
$text = $new_text;
diff --git a/models/phrase_model.php b/models/phrase_model.php
index b43048789..0e51a0a65 100755
--- a/models/phrase_model.php
+++ b/models/phrase_model.php
@@ -281,6 +281,7 @@ class PhraseModel extends Model
$results = NULL;
}
if($results == NULL) {
+ $total_rows = 0;
$results['TOTAL_ROWS'] = 0;
}
if(isset($total_rows)) {
diff --git a/scripts/mix.js b/scripts/mix.js
index 6d3fd9f68..cd04e35ed 100644
--- a/scripts/mix.js
+++ b/scripts/mix.js
@@ -29,7 +29,7 @@
* @copyright 2009, 2010, 2011
* @filesource
*/
-/
+
/**
* Contains javascripts used to edit Crawl Mixes
* A crawl mix consists of a sequence of groups. Each group