Author: nathangray
New Revision: 55465
URL: http://svn.stylite.de/viewvc/egroupware?rev=55465&view=rev
Log:
Remove extra line break processing, now handled by parent class
Modified:
branches/14.2/infolog/ (props changed)
branches/14.2/infolog/inc/class.infolog_merge.inc.php
Propchange: branches/14.2/infolog/
— svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 20:38:46 2016
@@ -1,1 +1,1 @@
-/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038,55058,55098
+/trunk/infolog:51376,51564,51630,51633,51645-51646,51648,51651,51658,51692,51760,51812,51817,51828,51935,51945-51946,51953,52021,52065,52075,52078,52111,52151,52238,52245,52265,52362,52381,52437,52467,52480,52506,52509,52536,52732,52735,52774,52782,52806,52809,52971-52973,52983-52988,53087,53116,53146-53147,53180,53194,53214,53449,53453,53500,53546,53562,53623,54165,54304,54332,54387,54391,54409,54443,54481,54557,54629,54668,55037-55038,55058,55098,55464
— branches/14.2/infolog/inc/class.infolog_merge.inc.php (original)
+++ branches/14.2/infolog/inc/class.infolog_merge.inc.php Mon Mar 21 20:38:46 2016
@@ -108,16 +108,6 @@
if($record->info_contact)
{
$array[‘info_contact’] = $array[‘info_link’][‘title’];
-
}
-
-
// Make sure line breaks get preserved (Needed for emails in particular)
-
switch($this->mimetype)
-
{
-
case 'application/vnd.oasis.opendocument.text': // open office
-
case 'application/vnd.oasis.opendocument.spreadsheet':
-
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': // ms office 2007
-
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-
$record->info_des = nl2br($record->info_des);
}
// Set any missing custom fields, or the marker will stay
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
