Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1108792
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Mon, Aug 25, 2:11 AM
Size
1 KB
Mime Type
text/x-diff
Expires
Wed, Aug 27, 2:11 AM (1 h, 49 m)
Engine
blob
Format
Raw Data
Handle
715720
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php
===================================================================
--- branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php (revision 6946)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php (revision 6947)
@@ -1,29 +1,37 @@
<?php
+//die('aaa');
// new startup: begin
define('REL_PATH', 'admin');
$relation_level = count( explode('/', REL_PATH) );
define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
if (!defined('IS_INSTALL')) define('IS_INSTALL', 1);
require_once FULL_PATH.'/kernel/startup.php';
// new startup: end
$application =& kApplication::Instance();
$application->Init();
require_once FULL_PATH.'/admin/install/install_lib.php';
// 1. run in-portal install scripts & import language packs
RunSchemaFile($application->Conn, FULL_PATH.'/admin/install/inportal_schema.sql', 'dbconnection');
RunSQLFile($application->Conn, FULL_PATH.'/admin/install/inportal_data.sql', 'dbconnection');
+ if (!(isset($ini_file) && $ini_file)) {
+ $ini_file = FULL_PATH.'/config.php';
+ $ini_vars = inst_parse_portal_ini($ini_file, true);
+ }
+
$sql = 'SELECT Version FROM '.TABLE_PREFIX.'Modules WHERE Name = '.$application->Conn->qstr('In-Portal');
$mod_version = $application->Conn->GetOne($sql);
set_ini_value('Module Versions', 'In-Portal', $mod_version);
save_values();
// 2. run in-commerce install script
$application->SetVar('skip_redirect', true);
+ $application->SetVar('redirect', true); // simulate external call to install.php script
+
include_once FULL_PATH.'/in-commerce/admin/install.php';
?>
\ No newline at end of file
Property changes on: branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.2
\ No newline at end of property
+1.1.2.3
\ No newline at end of property
Event Timeline
Log In to Comment