[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6579] merge 6577:6578 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6579] merge 6577:6578 from trunk |
Date: |
Wed, 10 Nov 2010 22:41:51 +0000 |
Revision: 6579
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6579
Author: sigurdne
Date: 2010-11-10 22:41:51 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
merge 6577:6578 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
2010-11-10 22:14:47 UTC (rev 6578)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
2010-11-10 22:41:51 UTC (rev 6579)
@@ -359,16 +359,33 @@
// if( isset($setup_info[$key]['tables'])
// && $setup_info[$key]['tables']
// &&
file_exists($appdir.'default_records.inc.php'))
- if(
file_exists($appdir.'default_records.inc.php'))
+ $default_found = false;
+
+ $ConfigDomain =
phpgw::get_var('ConfigDomain','string', 'COOKIE');
+
+ if(
file_exists($appdir.$ConfigDomain.'/default_records.inc.php'))
{
+ $default_records =
$appdir.$ConfigDomain.'/default_records.inc.php';
+ $default_found = true;
+ }
+ else if(
file_exists($appdir.'default_records.inc.php'))
+ {
+ $default_records =
$appdir.'default_records.inc.php';
+ $default_found = true;
+ }
+
+ if( $default_found )
+ {
if($DEBUG)
{
echo
'<br>process->default_records(): Including default records for ' . $appname .
"\n";
}
$oProc =
&$GLOBALS['phpgw_setup']->oProc; // to be compatible with old apps
- require_once
$appdir.'default_records.inc.php';
+
+ require_once $default_records;
}
+
/* $setup_info[$key]['status'] = 'C'; */
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6579] merge 6577:6578 from trunk,
Sigurd Nes <=