Exclude E_STRICT from error_reporting for PHP 5.4

pull/1/head
alecpl 13 years ago
parent 54d074613f
commit 66d2152ab5

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Exclude E_STRICT from error_reporting for PHP 5.4
- Copy all skins in installto script (#1488376) - Copy all skins in installto script (#1488376)
- Prevent from folder selection on virtual folder collapsing (#1488346) - Prevent from folder selection on virtual folder collapsing (#1488346)

@ -335,10 +335,6 @@ class html_inputfield extends html
if ($attrib['type']) { if ($attrib['type']) {
$this->type = $attrib['type']; $this->type = $attrib['type'];
} }
if ($attrib['newline']) {
$this->newline = true;
}
} }
/** /**
@ -381,11 +377,12 @@ class html_passwordfield extends html_inputfield
* @package HTML * @package HTML
*/ */
class html_hiddenfield extends html_inputfield class html_hiddenfield extends html
{ {
protected $tagname = 'input';
protected $type = 'hidden'; protected $type = 'hidden';
protected $fields_arr = array(); protected $fields_arr = array();
protected $newline = true; protected $allowed = array('type','name','value','onchange','disabled','readonly');
/** /**
* Constructor * Constructor

@ -68,7 +68,7 @@ if (set_include_path($include_path) === false) {
die("Fatal error: ini_set/set_include_path does not work."); die("Fatal error: ini_set/set_include_path does not work.");
} }
ini_set('error_reporting', E_ALL&~E_NOTICE); ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT));
// increase maximum execution time for php scripts // increase maximum execution time for php scripts
// (does not work in safe mode) // (does not work in safe mode)

@ -78,7 +78,7 @@ class rcube_charset
* @param int Level of the error * @param int Level of the error
* @param string Error message * @param string Error message
*/ */
public function error_handler($errno, $errstr) public static function error_handler($errno, $errstr)
{ {
throw new ErrorException($errstr, 0, $errno); throw new ErrorException($errstr, 0, $errno);
} }

@ -883,7 +883,7 @@ class rcube_contacts extends rcube_addressbook
* @param string New name to set for this group * @param string New name to set for this group
* @return boolean New name on success, false if no data was changed * @return boolean New name on success, false if no data was changed
*/ */
function rename_group($gid, $newname) function rename_group($gid, $newname, &$new_gid)
{ {
// make sure we have a unique name // make sure we have a unique name
$name = $this->unique_groupname($newname); $name = $this->unique_groupname($newname);

@ -263,7 +263,7 @@ class PEAR
* @access public * @access public
* @return bool true if parameter is an error * @return bool true if parameter is an error
*/ */
function isError($data, $code = null) static function isError($data, $code = null)
{ {
if (!is_object($data) || !is_a($data, 'PEAR_Error')) { if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
return false; return false;

Loading…
Cancel
Save