From 012685d938ac342cf6d7c18b0580d5b9c1e757a4 Mon Sep 17 00:00:00 2001
From: Umer Muhammad <umer.practiceproviders@nxvt.com>
Date: Tue, 22 Mar 2016 16:50:39 +0500
Subject: [PATCH] PHP warning fixes.

-fixed missing argument 3 for optionalAge warning
-fixed globals script substr() expects parameter 1 to be string warning
---
 interface/super/edit_globals.php | 2 +-
 library/options.inc.php          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/super/edit_globals.php b/interface/super/edit_globals.php
index 121161da8..b7248a22e 100644
--- a/interface/super/edit_globals.php
+++ b/interface/super/edit_globals.php
@@ -197,7 +197,7 @@ if ($_POST['form_save'] && $_GET['mode'] != "user") {
 	  }
       sqlStatement("DELETE FROM globals WHERE gl_name = '$fldid'");
 
-      if (substr($fldtype, 0, 2) == 'm_') {
+      if (!is_array($fldtype) && substr($fldtype, 0, 2) == 'm_') {
         if (isset($_POST["form_$i"])) {
           $fldindex = 0;
           foreach ($_POST["form_$i"] as $fldvalue) {
diff --git a/library/options.inc.php b/library/options.inc.php
index 4a447dcce..ce8780166 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -1677,8 +1677,9 @@ function generate_display_field($frow, $currvalue) {
 
   // date
   else if ($data_type == 4) {
+    $asof = ''; //not used here, but set to prevent a php warning when call optionalAge
     $s = '';
-    $agestr = optionalAge($frow, $currvalue);
+    $agestr = optionalAge($frow, $currvalue, $asof);
     if ($agestr) {
       $s .= "<table cellpadding='0' cellspacing='0'><tr><td class='text'>";
     }
-- 
2.11.4.GIT