Fixes for live environment and updates to admin/service/update

2011-07-22 11:04:20 +10:00
parent 27cdab1fe4
commit c8c4c5176d
41 changed files with 2457 additions and 82 deletions
--- a/modules/core/database_join_fields.inc.php
+++ b/modules/core/database_join_fields.inc.php
@@ -71,7 +71,7 @@ function CORE_database_join_fields($result, $linked)
 			while (!$rss->EOF) {					
 				for ($ii=0; $ii < count($result); $ii++ ) {
 					if($result[$ii][$field] == $rss->fields[id]) {
-						if(ereg(',',$link_field)) {
+						if(preg_match('/,/',$link_field)) {
 							$fields = explode(',',$link_field);
 							for($iii=0; $iii<count($fields); $iii++) {
 								$fieldname = $fields[$iii];
@@ -91,4 +91,4 @@ function CORE_database_join_fields($result, $linked)
 	}
 	return $result;
 }		
-?>
+?>