Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F802426
custom
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
Sun, Feb 23, 10:47 PM
Size
4 KB
Mime Type
text/x-diff
Expires
Tue, Feb 25, 10:47 PM (1 d, 13 h)
Engine
blob
Format
Raw Data
Handle
574255
Attached To
rMCUS Modules.Custom
custom
View Options
Index: branches/1.3.x/install/upgrades.php
===================================================================
--- branches/1.3.x/install/upgrades.php (revision 16503)
+++ branches/1.3.x/install/upgrades.php (revision 16504)
@@ -1,65 +1,66 @@
<?php
/**
* @version $Id$
* @package Custom
* @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
* @license GNU/GPL
* In-Portal is Open Source software.
* This means that this software may have been modified pursuant
* the GNU General Public License, and as distributed it includes
* or is derivative of works licensed under the GNU General Public License
* or other free or open source software licenses.
* See http://www.in-portal.org/license for copyright notices and details.
*/
defined('FULL_PATH') or die('restricted access!');
$upgrade_class = 'CustomUpgrades';
/**
* Class, that holds all upgrade scripts for "Custom" module
*
*/
class CustomUpgrades extends kUpgradeHelper {
public function __construct()
{
parent::__construct();
$this->dependencies = Array (
'1.0.0' => Array ('Core' => '5.0.0'),
'1.0.1' => Array ('Core' => '5.0.1'),
'1.0.2-B1' => Array ('Core' => '5.0.2-B1'),
'1.0.2-B2' => Array ('Core' => '5.0.2-B2'),
'1.0.2-RC1' => Array ('Core' => '5.0.2-RC1'),
'1.0.2' => Array ('Core' => '5.0.2'),
'1.0.3-B1' => Array ('Core' => '5.0.3-B1'),
'1.0.3-RC1' => Array ('Core' => '5.0.3-RC1'),
'1.0.3' => Array ('Core' => '5.0.3'),
'1.0.4-B1' => Array ('Core' => '5.0.4-B1'),
'1.0.4' => Array ('Core' => '5.0.4'),
'1.1.0-B1' => Array ('Core' => '5.1.0-B1'),
'1.1.0-B2' => Array ('Core' => '5.1.0-B2'),
'1.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
'1.1.0' => Array ('Core' => '5.1.0'),
'1.1.1-B1' => Array ('Core' => '5.1.1-B1'),
'1.1.1-RC1' => Array ('Core' => '5.1.1-RC1'),
'1.1.1' => Array ('Core' => '5.1.1'),
'1.1.2-B1' => Array ('Core' => '5.1.2-B1'),
'1.1.2-RC1' => Array ('Core' => '5.1.2-RC1'),
'1.1.2' => Array ('Core' => '5.1.2'),
'1.1.3-B1' => Array ('Core' => '5.1.3-B1'),
'1.1.3-B2' => Array ('Core' => '5.1.3-B2'),
'1.1.3' => Array ('Core' => '5.1.3'),
'1.2.0-B1' => Array ('Core' => '5.2.0-B1'),
'1.2.0-B2' => Array ('Core' => '5.2.0-B2'),
'1.2.0-B3' => Array ('Core' => '5.2.0-B3'),
'1.2.0-RC1' => Array ('Core' => '5.2.0-RC1'),
'1.2.0' => Array ('Core' => '5.2.0'),
'1.2.1-B1' => Array ('Core' => '5.2.1-B1'),
'1.2.1-B2' => Array ('Core' => '5.2.1-B2'),
'1.2.1-RC1' => Array ('Core' => '5.2.1-RC1'),
'1.2.1' => Array ('Core' => '5.2.1'),
+ '1.2.2-B1' => Array ('Core' => '5.2.2-B1'),
);
}
}
Index: branches/1.3.x/install.php
===================================================================
--- branches/1.3.x/install.php (revision 16503)
+++ branches/1.3.x/install.php (revision 16504)
@@ -1,38 +1,38 @@
<?php
$module_folder = 'modules/custom';
if ( !defined('IS_INSTALL') ) {
// separate module install
define('IS_INSTALL', 1);
define('ADMIN', 1);
define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
include_once(FULL_PATH . '/core/kernel/startup.php');
require_once FULL_PATH . '/core/install/install_toolkit.php';
$constants_file = FULL_PATH . '/' . $module_folder . '/constants.php';
if ( file_exists($constants_file) ) {
require_once $constants_file;
}
$toolkit = new kInstallToolkit();
}
else {
// install, using installation wizard
$toolkit =& $this->toolkit;
/* @var $toolkit kInstallToolkit */
}
$application =& kApplication::Instance();
$application->Init();
if ( $application->RecallVar('user_id') != USER_ROOT ) {
die('restricted access!');
}
$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql');
-$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
+$toolkit->ImportLanguage('/' . $module_folder . '/install/english', isset($constants_file));
-$toolkit->finalizeModuleInstall($module_folder, false);
\ No newline at end of file
+$toolkit->finalizeModuleInstall($module_folder, false);
Index: branches/1.3.x
===================================================================
--- branches/1.3.x (revision 16503)
+++ branches/1.3.x (revision 16504)
Property changes on: branches/1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
Merged /modules/custom/branches/1.2.x:r16449,16485
Merged /modules/custom/releases/1.2.2-B1:r16491
Event Timeline
Log In to Comment