Revision: 2166
http://mrbs.svn.sourceforge.net/mrbs/?rev=2166&view=rev
Author: cimorrison
Date: 2011-11-02 17:56:09 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Removed a few undefined index errors
Modified Paths:
--------------
mrbs/trunk/web/edit_users.php
mrbs/trunk/web/functions_mail.inc
mrbs/trunk/web/functions_view.inc
mrbs/trunk/web/search.php
Modified: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php 2011-11-02 16:01:58 UTC (rev 2165)
+++ mrbs/trunk/web/edit_users.php 2011-11-02 17:56:09 UTC (rev 2166)
@@ -830,7 +830,8 @@
default:
// Where there's an associative array of options, display
// the value rather than the key
- if (is_assoc($select_options["users.$key"]))
+ if (isset($select_options["users.$key"]) &&
+ is_assoc($select_options["users.$key"]))
{
if (isset($select_options["users.$key"][$row[$key]]))
{
Modified: mrbs/trunk/web/functions_mail.inc
===================================================================
--- mrbs/trunk/web/functions_mail.inc 2011-11-02 16:01:58 UTC (rev 2165)
+++ mrbs/trunk/web/functions_mail.inc 2011-11-02 17:56:09 UTC (rev 2166)
@@ -627,7 +627,8 @@
}
}
// For any associative arrays we want the value rather than the key
- if (is_assoc($select_options["entry.$key"]) &&
+ if (isset($select_options["entry.$key"]) &&
+ is_assoc($select_options["entry.$key"]) &&
array_key_exists($value, $select_options["entry.$key"]))
{
$value = $select_options["entry.$key"][$value];
Modified: mrbs/trunk/web/functions_view.inc
===================================================================
--- mrbs/trunk/web/functions_view.inc 2011-11-02 16:01:58 UTC (rev 2165)
+++ mrbs/trunk/web/functions_view.inc 2011-11-02 17:56:09 UTC (rev 2166)
@@ -178,7 +178,8 @@
{
// If the custom field is an associative array then we want
// the value rather than the array key
- if (is_assoc($select_options["entry.$key"]) &&
+ if (isset($select_options["entry.$key"]) &&
+ is_assoc($select_options["entry.$key"]) &&
array_key_exists($data[$key], $select_options["entry.$key"]))
{
$value = $select_options["entry.$key"][$data[$key]];
Modified: mrbs/trunk/web/search.php
===================================================================
--- mrbs/trunk/web/search.php 2011-11-02 16:01:58 UTC (rev 2165)
+++ mrbs/trunk/web/search.php 2011-11-02 17:56:09 UTC (rev 2166)
@@ -207,7 +207,8 @@
{
// If we've got a field that is represented by an associative array of
options
// then we have to search for the keys whose values match the search string
- if (is_assoc($select_options["entry." . $field['name']]))
+ if (isset($select_options["entry." . $field['name']]) &&
+ is_assoc($select_options["entry." . $field['name']]))
{
foreach($select_options["entry." . $field['name']] as $key => $value)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA® Conference 2012
Save $700 by Nov 18
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
