# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: Joomla root
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
--- administrator/components/com_comprofiler/admin.comprofiler.html.php
+++ administrator/components/com_comprofiler/admin.comprofiler.html.php
@@ -170,9 +170,9 @@
for ($i=0, $n=count( $col1fields ); $i < $n; $i++) {
$col1field = $col1fields[$i];
if(trim($col1field)!='' && trim($col1field)!=null) {
- $text = array_search($col1field,$fields);
- if ( is_string( $text ) ) {
- $col1options .= "". htmlspecialchars( getLangDefinition($text) ) ."\n";
+ $exists = array_key_exists($col1field,$fields);
+ if ( $exists ) {
+ $col1options .= " ". htmlspecialchars( getLangDefinition($fields[$col1field]) ) ."\n";
$fieldids[] = $col1field;
} else {
$notFoundFielIds[] = $col1field;
@@ -183,9 +183,9 @@
for ($i=0, $n=count( $col2fields ); $i < $n; $i++) {
$col2field = $col2fields[$i];
if(trim($col2field)!='' && trim($col2field)!=null) {
- $text = array_search($col2field,$fields);
- if ( is_string( $text ) ) {
- $col2options .= " ". htmlspecialchars( getLangDefinition($text) ) ."\n";
+ $exists = array_key_exists($col2field,$fields);
+ if ( $exists ) {
+ $col2options .= " ". htmlspecialchars( getLangDefinition($fields[$col2field]) ) ."\n";
$fieldids[] = $col2field;
} else {
$notFoundFielIds[] = $col2field;
@@ -196,9 +196,9 @@
for ($i=0, $n=count( $col3fields ); $i < $n; $i++) {
$col3field = $col3fields[$i];
if(trim($col3field)!='' && trim($col3field)!=null) {
- $text = array_search($col3field,$fields);
- if ( is_string( $text ) ) {
- $col3options .= " ". htmlspecialchars( getLangDefinition($text) ) ."\n";
+ $exists = array_key_exists($col3field,$fields);
+ if ( $exists ) {
+ $col3options .= " ". htmlspecialchars( getLangDefinition($fields[$col3field]) ) ."\n";
$fieldids[] = $col3field;
} else {
$notFoundFielIds[] = $col3field;
@@ -209,9 +209,9 @@
for ($i=0, $n=count( $col4fields ); $i < $n; $i++) {
$col4field = $col4fields[$i];
if(trim($col4field)!='' && trim($col4field)!=null) {
- $text = array_search($col4field,$fields);
- if ( is_string( $text ) ) {
- $col4options .= " ". htmlspecialchars( getLangDefinition($text) ) ."\n";
+ $exists = array_key_exists($col4field,$fields);
+ if ( $exists ) {
+ $col4options .= " ". htmlspecialchars( getLangDefinition($fields[$col4field]) ) ."\n";
$fieldids[] = $col4field;
} else {
$notFoundFielIds[] = $col4field;
@@ -221,7 +221,7 @@
}
// this query is for listing displayable fields which are not yet in a column:
- $fieldsRemaining = array_diff( $fields, $fieldids );
+ $fieldsRemaining = array_diff( array_keys( $fields ), $fieldids );
if ( count( $fieldsRemaining ) > 0 ) {
$_CB_database->setQuery( "SELECT f.fieldid, f.title, f.name"
. "\n FROM #__comprofiler_fields f"