ImportTimoutError: THIS MESSAGE WAS NOT PARSED BY THE IMPORTER!!
Return-Path: egroupware-cvs-bounces@lists.sourceforge.net
X-Original-To: lists+1266706073828-308044@n3.nabble.com
Delivered-To: lists+1266706073828-308044@n3.nabble.com
Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88])
by mwork.nabble.com (Postfix) with ESMTP id 9C17614901635
for lists+1266706073828-308044@n3.nabble.com; Sun, 14 Feb 2016 09:47:15 -0800 (PST)
Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com)
by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
(envelope-from egroupware-cvs-bounces@lists.sourceforge.net)
id 1aV0sn-0006Mg-IM; Sun, 14 Feb 2016 17:54:53 +0000
Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191]
helo=mx.sourceforge.net)
by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
(envelope-from ralfbecker@users.sourceforge.net)
id 1aV0sm-0006Ma-Rc for egroupware-cvs@lists.sourceforge.net;
Sun, 14 Feb 2016 17:54:52 +0000
X-ACL-Warn:
Received: from dovecot.stylite.de ([213.183.76.200])
by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256)
(Exim 4.76) id 1aV0sl-000487-Li
for egroupware-cvs@lists.sourceforge.net;
Sun, 14 Feb 2016 17:54:52 +0000
Received: from localhost.localdomain (svn [10.40.8.12])
by dovecot.stylite.de (Postfix) with ESMTP id B1E341C6
for egroupware-cvs@lists.sf.net; Sun, 14 Feb 2016 18:54:45 +0100 (CET)
MIME-Version: 1.0
Date: Sun, 14 Feb 2016 17:54:45 -0000
To: egroupware-cvs@lists.sf.net
From: ralfbecker@users.sourceforge.net
X-Mailer: svnmailer-1.0.8
X-Spam-Score: 1.0 (+)
X-Spam-Report: Spam Filtering performed by mx.sourceforge.net.
See http://spamassassin.org/tag/ for more details.
1.0 MISSING_MID Missing Message-Id: header
X-Headers-End: 1aV0sl-000487-Li
Subject: [eGroupWare-svn] r55003 - in /branches/14.2/phpgwapi: ./
inc/common_functions.inc.php
X-BeenThere: egroupware-cvs@lists.sourceforge.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: “SVN commits (automaticaly generated)”
<egroupware-cvs.lists.sourceforge.net>
List-Unsubscribe: https://lists.sourceforge.net/lists/listinfo/egroupware-cvs,
mailto:egroupware-cvs-request@lists.sourceforge.net?subject=unsubscribe
List-Archive: http://sourceforge.net/mailarchive/forum.php?forum_name=egroupware-cvs
List-Post: mailto:egroupware-cvs@lists.sourceforge.net
List-Help: mailto:egroupware-cvs-request@lists.sourceforge.net?subject=help
List-Subscribe: https://lists.sourceforge.net/lists/listinfo/egroupware-cvs,
mailto:egroupware-cvs-request@lists.sourceforge.net?subject=subscribe
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: egroupware-cvs-bounces@lists.sourceforge.net
Message-Id: E1aV0sn-0006Mg-IM@sfs-ml-4.v29.ch3.sourceforge.com
Author: ralfbecker
Date: Sun Feb 14 18:54:45 2016
New Revision: 55003
URL: http://svn.stylite.de/viewvc/egroupware?rev=55003&view=rev
Log:
remove Exception from function signature of egw_exception_handler and _egw_log_exception, as php 7 throws Error not inherited from Exception, but Throwable does not exist in php < 7.0
Modified:
branches/14.2/phpgwapi/ (props changed)
branches/14.2/phpgwapi/inc/common_functions.inc.php
Propchange: branches/14.2/phpgwapi/
— svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 18:54:45 2016
@@ -1,1 +1,1 @@
-/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52494,52497,52501,52517-52518,52532,52534,52575,52579,52588,52596,52598,52604,52608,52619,52621,52653,52684,52686,52706,52730,52732,52752,52787,52797,52820,52846,52900,52905,52908,52912,52958,52961,53008,53011,53021-53022,53024,53047,53051,53067,53080-53081,53085,53087,53095,53097,53101,53112,53116,53145-53147,53173,53185,53187,53192,53200,53205,53215,53244,53252,53254,53264,53270,53277,532
85,53287,53290,53293,53295,53299,53321-53322,53326,53329-53330,53333,53336,53360-53361,53364,53374,53381-53383,53397,53400,53409,53411,53416,53434,53447,53451,53455,53457,53474,53477,53480,53482,53486,53494,53501,53503,53540,53542,53553,53595,53630,53643,53657,53667,53670,53684,53694,53707,53712,53726,53732,53746,53757,53759,53762,53774,53781-53782,53791,53817,53820,53825,53847,53858,53865,53875,53901,53914,53922,53960,53974,53989,53991,53997,53999,54040,54062,54089,54091,54097,54136,54143,54148,54172,54218,54227,54241-54242,54267,54273,54311,54415,54439,54470,54559,54844,54937
+/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52494,52497,52501,52517-52518,52532,52534,52575,52579,52588,52596,52598,52604,52608,52619,52621,52653,52684,52686,52706,52730,52732,52752,52787,52797,52820,52846,52900,52905,52908,52912,52958,52961,53008,53011,53021-53022,53024,53047,53051,53067,53080-53081,53085,53087,53095,53097,53101,53112,53116,53145-53147,53173,53185,53187,53192,53200,53205,53215,53244,53252,53254,53264,53270,53277,532
85,53287,53290,53293,53295,53299,53321-53322,53326,53329-53330,53333,53336,53360-53361,53364,53374,53381-53383,53397,53400,53409,53411,53416,53434,53447,53451,53455,53457,53474,53477,53480,53482,53486,53494,53501,53503,53540,53542,53553,53595,53630,53643,53657,53667,53670,53684,53694,53707,53712,53726,53732,53746,53757,53759,53762,53774,53781-53782,53791,53817,53820,53825,53847,53858,53865,53875,53901,53914,53922,53960,53974,53989,53991,53997,53999,54040,54062,54089,54091,54097,54136,54143,54148,54172,54218,54227,54241-54242,54267,54273,54311,54415,54439,54470,54559,54844,54937,54998,55002
— branches/14.2/phpgwapi/inc/common_functions.inc.php (original)
+++ branches/14.2/phpgwapi/inc/common_functions.inc.php Sun Feb 14 18:54:45 2016
@@ -1777,10 +1777,10 @@
/**
- Clasify exception for a headline and log it to error_log, if not running as cli
-
-
-
@param Exception|Error $e
-
@param string &$headline
*/
-function _egw_log_exception(Exception $e,&$headline=null)
+function _egw_log_exception($e,&$headline=null)
{
$trace = explode("\n", $e->getTraceAsString());
if ($e instanceof egw_exception_no_permission)
@@ -1824,9 +1824,9 @@
-
- Does NOT return
-
-
- */
-function egw_exception_handler(Exception $e)
-
-
@param Exception|Error $e
- */
+function egw_exception_handler($e)
{
// handle redirects without logging
if (is_a($e, ‘egw_exception_redirect’))
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
