Skip to content

Issue #15 Fixed library creation if/then to prevent false errors #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Issue #15 Fixed library creation if/then to prevent false errors #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59faf8f
Issue #19 Added code to address library perm error with libraries 2.2
Jun 20, 2014
9267cf3
Issue #14 Fixed if/then in kalatheme_process_page to include empty va…
Jun 20, 2014
75545a2
Issue #15 Fixed library creation if/then to prevent false errors
Jun 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions includes/utils.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ function kalatheme_has_write_access() {
function kalatheme_lib_dir() {
if (!is_dir('sites/all/libraries')) {
mkdir(DRUPAL_ROOT . '/sites/all/libraries');
chmod(DRUPAL_ROOT . '/sites/all/libraries', 0755);
} else {
chmod(DRUPAL_ROOT . '/sites/all/libraries', 0755);
}
return is_dir('sites/all/libraries') ? 'sites/all/libraries' : 'sites/all';
}
Expand Down
12 changes: 7 additions & 5 deletions kalatheme.drush.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ function drush_kalatheme($name = NULL) {
// Write the custom bootstrap library if applicable
$current_dir = getcwd();
chdir($dtemp);
if (($theme_settings['bootstrap_library'] == 'custom') && ($filepath = drush_download_file($custom))) {
if (($theme_settings['bootstrap_library'] == 'custom')) {
$filepath = drush_download_file($custom);
if (empty($filepath)) {
drush_print(dt('Could not download custom library.'));
return;
}
$filename = basename($filepath);
$dirname = basename($filepath, '.zip');
$library_name = $machine_name . '_bootstrap';
Expand All @@ -140,10 +145,7 @@ function drush_kalatheme($name = NULL) {
drush_op('kalatheme_custom_bootstrap_library_integrate', $files, $machine_name, $dtemp, $lib_tmp_directory, $sub_tmp_directory, !$no_magic);
drush_move_dir($lib_tmp_directory, $library_path, FILE_EXISTS_OVERWRITE);
}
else {
drush_print(dt('Could not download custom library.'));
return;
}

// Return
chdir($current_dir);
// Move the subtheme into the right directory
Expand Down
2 changes: 1 addition & 1 deletion template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function kalatheme_process_page(&$variables) {
// Use the CDN if not using libraries
if (!kalatheme_use_libraries()) {
$library = theme_get_setting('bootstrap_library');
if ($library !== 'none') {
if ($library !== 'none' && !empty($library)) {
// Add the JS
drupal_add_js($base['scheme'] . ":" . KALATHEME_BOOTSTRAP_JS, 'external');
// Add the CSS
Expand Down