R53540 - in /trunk/phpgwapi/setup: setup.inc.php tables_update.inc.php

Author: ralfbecker
New Revision: 53540

URL: http://svn.stylite.de/viewvc/egroupware?rev=53540&view=rev
Log:

  • All apps: fix broken group-favorites

Modified:
trunk/phpgwapi/setup/setup.inc.php
trunk/phpgwapi/setup/tables_update.inc.php

Modified: trunk/phpgwapi/setup/setup.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/setup/setup.inc.php?rev=53540&r1=53539&r2=53540&view=diff

— trunk/phpgwapi/setup/setup.inc.php (original)
+++ trunk/phpgwapi/setup/setup.inc.php Wed Sep 2 15:08:25 2015
@@ -12,7 +12,7 @@
/* Basic information about this app */
$setup_info[‘phpgwapi’][‘name’] = ‘phpgwapi’;
$setup_info[‘phpgwapi’][‘title’] = ‘EGroupware API’;
-$setup_info[‘phpgwapi’][‘version’] = ‘14.3.903’;
+$setup_info[‘phpgwapi’][‘version’] = ‘14.3.904’;
$setup_info[‘phpgwapi’][‘versions’][‘current_header’] = ‘1.29’;
$setup_info[‘phpgwapi’][‘enable’] = 3;
$setup_info[‘phpgwapi’][‘app_order’] = 1;

Modified: trunk/phpgwapi/setup/tables_update.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/setup/tables_update.inc.php?rev=53540&r1=53539&r2=53540&view=diff

— trunk/phpgwapi/setup/tables_update.inc.php (original)
+++ trunk/phpgwapi/setup/tables_update.inc.php Wed Sep 2 15:08:25 2015
@@ -836,7 +836,7 @@
{
$value = array(
‘name’ => substr($name, 9), // skip “favorite_”

  •   		'group' => !($owner > 0),
    
  •   		'group' => $owner < -2 ? $owner+2 : false,
      		'state' => $state,
      	);
      }
    

@@ -863,6 +863,29 @@
}

/**

    • Fix by 14.3.003 broken group favorites
    • @return string
  • */
    +function phpgwapi_upgrade14_3_004()
    +{
  • $GLOBALS[‘run-from-upgrade14_3_004’] = true;
  • preferences::change_preference(null, ‘/^favorite_/’, function($name, $value, $owner)
  • {
  •   unset($name);	// not used, but required by function signature
    
  •   if ($value['group'] === true)
    
  •   {
    
  •   	$value['group'] = $owner+2;
    
  •   }
    
  •   return $value;
    
  • });
  • return $GLOBALS[‘setup_info’][‘phpgwapi’][‘currentver’] = ‘14.3.005’;
    +}

+/**

  • Updates on the way to 15.1
    */

@@ -871,7 +894,7 @@
*

  • @return string
    */
    -function phpgwapi_upgrade14_3_004()
    +function phpgwapi_upgrade14_3_005()
    {
    $GLOBALS[‘egw_setup’]->oProc->DropTable(‘egw_api_content_history’);

@@ -923,3 +946,15 @@

return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.903';

}
+
+/**

    • Run 14.3.004 upgrade for everyone who was already on 14.3.900
  • */
    +function phpgwapi_upgrade14_3_903()
    +{
  • if (empty($GLOBALS[‘run-from-upgrade14_3_004’]))
  • {
  •   phpgwapi_upgrade14_3_004();
    
  • }
  • return $GLOBALS[‘setup_info’][‘phpgwapi’][‘currentver’] = ‘14.3.904’;
    +}

Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140


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