holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PHP7 fix, unsetting function arguments (for quitening IDE warning of not using them) before calling func_get_args() return no longer any arguments, need to be done after

Browse Source
This commit is contained in:
Ralf Becker 2016-03-24 08:40:43 +00:00
parent a03748fbb2
commit 2e148944cd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -315,9 +315,10 @@ abstract class egw_framework
*/
public static function refresh_opener($msg, $app, $id=null, $type=null, $targetapp=null, $replace=null, $with=null, $msg_type=null)
{
unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
//error_log(__METHOD__.'('.array2string(func_get_args()).')');
self::$extra['refresh-opener'] = func_get_args();
unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
}
/**
@ -330,8 +331,9 @@ abstract class egw_framework
*/
public static function message($msg, $type='success')
{
unset($msg, $type); // used only via func_get_args();
self::$extra['message'] = func_get_args();
unset($msg, $type); // used only via func_get_args();
}
/**
@ -343,10 +345,11 @@ abstract class egw_framework
*/
public static function popup($link, $target='_blank', $popup='640x480')
{
unset($link, $target, $popup); // used only via func_get_args()
// default params are not returned by func_get_args!
$args = func_get_args()+array(null, '_blank', '640x480');
unset($link, $target, $popup); // used only via func_get_args()
if (egw_json_request::isJSONRequest())
{
egw_json_response::get()->apply('egw.open_link', $args);