Require install helper functions in schema.php

Following 29898e3 which moved install_db_now() to install_helper_functions_api.php, admin/index.php is throwing an error as the function is not defined within schema.php. We now require the API from within schema.php. Fixes #20553
mantisbt · Jan 30, 2016 · 6f20d37 · 6f20d37
1 parent ed72e4d
commit 6f20d37
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/admin/install.php b/admin/install.php
@@ -32,7 +32,6 @@
 define( 'MANTIS_MAINTENANCE_MODE', true );
 
 require_once( dirname( dirname( __FILE__ ) ) . '/core.php' );
-require_api( 'install_helper_functions_api.php' );
 require_api( 'crypto_api.php' );
 $g_error_send_page_header = false; # bypass page headers in error handler
 

diff --git a/admin/schema.php b/admin/schema.php
@@ -42,6 +42,11 @@
  * included in the corresponding release
  */
 
+/**
+ * @uses install_helper_functions_api.php
+ */
+require_api( 'install_helper_functions_api.php' );
+
 /**
  * Standard table creation options
  * Array key is the ADOdb datadict driver's name

diff --git a/admin/upgrade_unattended.php b/admin/upgrade_unattended.php
@@ -30,7 +30,6 @@
 define( 'MANTIS_MAINTENANCE_MODE', true );
 
 require_once( dirname( dirname( __FILE__ ) ) . '/core.php' );
-require_api( 'install_helper_functions_api.php' );
 require_api( 'crypto_api.php' );
 $g_error_send_page_header = false; # suppress page headers in the error handler
 

diff --git a/login_page.php b/login_page.php
@@ -185,8 +185,6 @@ function debug_setting_message ( $p_type, $p_setting, $p_value ) {
 	}
 
 	# Check for db upgrade for versions > 1.0.0 using new installer and schema
-	# Note: install_helper_functions_api.php required for db_null_date() function definition
-	require_api( 'install_helper_functions_api.php' );
 	require_once( 'admin' . DIRECTORY_SEPARATOR . 'schema.php' );
 	$t_upgrades_reqd = count( $g_upgrade ) - 1;