- Fork the main repo
- Make the fork your origin, and clone locally
- Work from the dev branch. dev is your home base
- Before you start work, update your local dev from upstream/dev
git checkout dev
git fetch upstream
git merge upstream/dev
git push origin
- Branch from dev locally
- Add and commit there
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* @file | |
* Drupal instance-specific configuration file. This is included at the end of | |
* the distributed settings.php, so use this to set everything related to | |
* your local instance. | |
* | |
* Example settings below. See the original settings.php for full | |
* documentation. | |
* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/xmlsitemap.module b/xmlsitemap.module | |
index 095fc7e..d9541df 100644 | |
--- a/xmlsitemap.module | |
+++ b/xmlsitemap.module | |
@@ -1061,7 +1061,12 @@ function xmlsitemap_link_bundle_load($entity, $bundle, $load_bundle_info = TRUE) | |
$info['info'] = $entity_info['bundles'][$bundle]; | |
} | |
} | |
- $info += variable_get("xmlsitemap_settings_{$entity}_{$bundle}", array()); | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* Instead of debugging this thoroughly, I strong-armed Predis into loading | |
* correctly. | |
*/ | |
require_once 'sites/all/modules/redis/redis.autoload.inc'; | |
define('PREDIS_BASE_PATH', DRUPAL_ROOT . '/profiles/dosomething/libraries/predis/lib/'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
if (isset($GLOBALS['drupal_test_info']) && !empty($test_info['test_run_id'])) { | |
$ret = $test_info['test_run_id']; | |
} else { | |
$prefixes = variable_get('cache_prefix', ''); | |
if (is_string($prefixes)) { | |
// Variable can be a string which then considered as a default | |
// behavior. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
; This file was auto-generated by drush make | |
core = 7.x | |
api = 2 | |
projects[drupal][version] = "7.26" | |
; Modules | |
; Please fill the following out. Type may be one of get, git, bzr or svn, | |
; and url is the url of the download. | |
projects[dosomething][download][type] = "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env bash | |
# Create the MySQL tables | |
for file in *.sql | |
do | |
echo $file | |
cat $file | mysql -u USER -pPASS DBNAME | |
cat $file | mysql -u USER -pPASS DBNAME | |
done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Vagrant.configure("2") do |config| | |
## Choose your base box | |
config.vm.box = "dosomething/drupal" | |
config.vm.provider "virtualbox" do |v| | |
v.customize ["modifyvm", :id, "--memory", 3072] | |
end | |
# SSH Agent forwarding |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# $Id$ | |
# | |
# LANGUAGE translation of Drupal (general) | |
# Copyright YEAR NAME <EMAIL@ADDRESS> | |
# Generated from files: | |
# theme-settings.php: n/a | |
# templates/user/user-profile.tpl.php: n/a | |
# paraneue_dosomething.info: n/a | |
# includes/form.inc: n/a | |
# includes/auth/register.inc: n/a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* Get user data from Northstar. | |
* | |
* @param int $id | |
* Northstar user ID | |
* | |
* @return object | |
*/ |