R55106 - in /trunk: addressbook/inc/ etemplate/inc/

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55106

URL: http://svn.stylite.de/viewvc/egroupware?rev=55106&view=rev
Log:
fix PHP Warning: declaration of method x should be compatible with parent

Modified:
trunk/addressbook/inc/class.addressbook_sql.inc.php
trunk/etemplate/inc/class.so_sql.inc.php
trunk/etemplate/inc/class.so_sql_cf.inc.php

Modified: trunk/addressbook/inc/class.addressbook_sql.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_sql.inc.php?rev=55106&r1=55105&r2=55106&view=diff

— trunk/addressbook/inc/class.addressbook_sql.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_sql.inc.php Mon Feb 22 18:13:48 2016
@@ -837,11 +837,12 @@
* Re-implemented to deal with extra contact_owner column
*
* @param array $data data to save (cf’s have to be prefixed with self::CF_PREFIX = #)

• • @param array $extra_cols =array() extra-data to be saved
  • @return bool false on success, errornumber on failure
    */

• function save_customfields($data)
• {

•   return parent::save_customfields($data, array('contact_owner' => $data['owner']));
  

• function save_customfields($data, array $extra_cols=array())

• {

•   return parent::save_customfields($data, array('contact_owner' => $data['owner'])+$extra_cols);
  

  }

  /**

Modified: trunk/etemplate/inc/class.so_sql.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.so_sql.inc.php?rev=55106&r1=55105&r2=55106&view=diff

— trunk/etemplate/inc/class.so_sql.inc.php (original)
+++ trunk/etemplate/inc/class.so_sql.inc.php Mon Feb 22 18:13:48 2016
@@ -237,16 +237,6 @@
}

/**

• • php4 constructor
• • @deprecated use __construct
• */
• function so_sql($app=’’,$table=’’,$db=null,$column_prefix=’’,$no_clone=false)
• {

•   self::__construct($app,$table,$db,$column_prefix,$no_clone);
  

• }
• /**
  • sets up the class for an app and table (by using the table-definition of $app/setup/tables_current.inc.php
  • If you need a more complex conversation then just removing the column_prefix, you have to do so in a derifed class !!!

Modified: trunk/etemplate/inc/class.so_sql_cf.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.so_sql_cf.inc.php?rev=55106&r1=55105&r2=55106&view=diff

— trunk/etemplate/inc/class.so_sql_cf.inc.php (original)
+++ trunk/etemplate/inc/class.so_sql_cf.inc.php Mon Feb 22 18:13:48 2016
@@ -210,7 +210,7 @@
* saves custom field data
*
* @param array $data data to save (cf’s have to be prefixed with self::CF_PREFIX = #)

• • @param array $extra_cols =array()

• • @param array $extra_cols =array() extra-data to be saved
  • @return bool false on success, errornumber on failure
    */
    function save_customfields($data, array $extra_cols=array())
    @@ -738,12 +738,4 @@
    return $this->allow_multiple_values && in_array($this->customfields[$name][‘type’],array(‘select’,‘select-account’)) &&
    $this->customfields[$name][‘rows’] > 1;
    }

• /**
• • Prevent someone calling the old php4 so_sql constructor
• */
• function so_sql()
• {

•   throw new egw_exception_assertion_failed('use __construct()!');
  

• }
  }

---

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs