Fix #6312 - php7 fixes

diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php
index d6b6bde..92c202e 100644 (file)
--- a/DataObjects/Core_project.php
+++ b/DataObjects/Core_project.php
@@ -175,7 +175,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject
         
     }
  
-    function onInsert()
+    function onInsert($request,$roo)
     {
         $oo = clone($this);
         if (empty($this->code)) {
@@ -186,7 +186,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject
         }
     }
     
-    function onUpdate($old)
+    function onUpdate($old, $request, $roo)
     {
         $oo = clone($this);
         if (empty($this->code)) {

diff --git a/I18n.php b/I18n.php
index 8367964..12ed22d 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -231,7 +231,7 @@ class Pman_Core_I18n extends Pman
         if (empty($k)) {
             return '??';
         }
-        $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
+        $lang = !$au || empty($au->lang ) ? 'en' : (is_string($au) ? $au : $au->lang);
         
         // does it need caching?