R56137 - in /branches/14.2/projectmanager: ./ inc/class.projectmanager_bo.inc.php

[nathangray]

Author: nathangray
New Revision: 56137

URL: http://svn.stylite.de/viewvc/egroupware?rev=56137&view=rev
Log:
Fix fallback project ID to not cause infinite loop

Modified:
branches/14.2/projectmanager/ (props changed)
branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php (contents, props changed)

Propchange: branches/14.2/projectmanager/

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 12 01:39:55 2016
@@ -1,1 +1,1 @@
-/trunk/projectmanager:51376,51411,51415,51449-51450,51473,51533-51534,51537,51581,51583,51591,51647,51652,51694,51718,51738,51740,51751,51791,51812,51817,51874-51875,51923,51925,51929,51948,52038,52100,52117,52360,52478,52751,53008,53359,53519,53523,53698,53704,53718,53748,54196,54446,54716,54736,54784,55704,55728,55768,55922,56000
+/trunk/projectmanager:51376,51411,51415,51449-51450,51473,51533-51534,51537,51581,51583,51591,51647,51652,51694,51718,51738,51740,51751,51791,51812,51817,51874-51875,51923,51925,51929,51948,52038,52100,52117,52360,52478,52751,53008,53359,53519,53523,53698,53704,53718,53748,54196,54446,54716,54736,54784,55704,55728,55768,55922,56000,56136

Modified: branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php?rev=56137&r1=56136&r2=56137&view=diff

— branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php (original)
+++ branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php Thu May 12 01:39:55 2016
@@ -526,7 +526,7 @@
if(!$index && $this->not_unique(array(‘pm_number’ => $pm_format))) // no index given and not unique
{
// have to use default

•   	$pm_format = $parent === '' ? sprintf('P-%04Y-%04d', date('Y')) : $parent.'/%04d';
  

•   	$pm_format = $parent === '' ? sprintf('P-%04s-%%04d', date('Y')) : $parent.'/%04d';
    }
    elseif(!$index)
    {
  

Propchange: branches/14.2/projectmanager/inc/class.projectmanager_bo.inc.php

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 12 01:39:55 2016
@@ -1,1 +1,1 @@
-/trunk/projectmanager/inc/class.projectmanager_bo.inc.php:51411,51415,51583,51591,51694,51751,54784
+/trunk/projectmanager/inc/class.projectmanager_bo.inc.php:51411,51415,51583,51591,51694,51751,54784,56136

---

Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j

---

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