Commit 9ab9cb56 authored by sun's avatar sun
Browse files

#325831 by quicksketch, James Andres, ksenzee: Fixed drupal_get_path() fails...

#325831 by quicksketch, James Andres, ksenzee: Fixed drupal_get_path() fails during Drupal installation.
parent 423c7e02
...@@ -6,11 +6,9 @@ jQuery UI x.x-x.x, xxxx-xx-xx ...@@ -6,11 +6,9 @@ jQuery UI x.x-x.x, xxxx-xx-xx
jQuery UI 7.x-1.x, xxxx-xx-xx jQuery UI 7.x-1.x, xxxx-xx-xx
----------------------------- -----------------------------
#325831 by quicksketch, James Andres, ksenzee: Fixed drupal_get_path() fails
during Drupal installation.
#357780 by Gbor Hojtsy: Ported to 7.x. #357780 by Gbor Hojtsy: Ported to 7.x.
jQuery UI 6.x-1.x, xxxx-xx-xx
-----------------------------
#362509 by Rob Loach, Deciphered, sun, and adrinux: New release system with #362509 by Rob Loach, Deciphered, sun, and adrinux: New release system with
jQuery UI 1.6. jQuery UI 1.6.
#322731 by sun: Fixed improper use of t() in module install file. #322731 by sun: Fixed improper use of t() in module install file.
......
...@@ -15,6 +15,7 @@ Authors: ...@@ -15,6 +15,7 @@ Authors:
* Jeff Robbins (jjeff) * Jeff Robbins (jjeff)
* Angela Byron (webchick) * Angela Byron (webchick)
* Addison Berry (add1sun) * Addison Berry (add1sun)
* Daniel F. Kudwien (sun)
This Module Made by Robots: http://www.lullabot.com This Module Made by Robots: http://www.lullabot.com
......
...@@ -17,7 +17,7 @@ function jquery_ui_requirements($phase) { ...@@ -17,7 +17,7 @@ function jquery_ui_requirements($phase) {
if ($phase == 'install') { if ($phase == 'install') {
// The jquery_ui_get_version() function is in the .module file, which isn't // The jquery_ui_get_version() function is in the .module file, which isn't
// loaded yet. // loaded yet.
include_once drupal_get_path('module', 'jquery_ui') . '/jquery_ui.module'; include_once dirname(__FILE__) . '/jquery_ui.module';
} }
$requirements['jquery_ui']['title'] = $t('jQuery UI'); $requirements['jquery_ui']['title'] = $t('jQuery UI');
......
...@@ -12,8 +12,17 @@ ...@@ -12,8 +12,17 @@
/** /**
* Path to jQuery UI library. * Path to jQuery UI library.
*
* During site installation, JQUERY_UI_PATH is the absolute path to the
* jQuery UI library. At all other times JQUERY_UI_PATH is relative, and
* safe for use in URLs.
*/ */
define('JQUERY_UI_PATH', drupal_get_path('module', 'jquery_ui') . '/jquery.ui'); if (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') {
define('JQUERY_UI_PATH', dirname(__FILE__) . '/jquery.ui');
}
else {
define('JQUERY_UI_PATH', drupal_get_path('module', 'jquery_ui') . '/jquery.ui');
}
/** /**
* Add the specified jQuery UI library files to this page. * Add the specified jQuery UI library files to this page.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment