summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-04 23:08:34 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-04 23:08:34 +0000
commitbb293ccfb5193d2f769af6a8422765784c205536 (patch)
tree2c635efe03fe2056ded63cf11feab571f4b214cf /includes
parent144bda7dbb2ec2a92c3c2b393c563e291b3fd073 (diff)
downloadbrdo-bb293ccfb5193d2f769af6a8422765784c205536.tar.gz
brdo-bb293ccfb5193d2f769af6a8422765784c205536.tar.bz2
#420358 follow-up by Dave Reid: Rename profiles default => standard and expert => minimal, for consistency with labels.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 70c2f9024..b6b315b6e 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -228,7 +228,7 @@ function drupal_get_profile() {
$profile = $install_state['parameters']['profile'];
}
else {
- $profile = variable_get('install_profile', 'default');
+ $profile = variable_get('install_profile', 'standard');
}
return $profile;
@@ -4381,7 +4381,7 @@ function drupal_json_encode($var) {
* Converts an HTML-safe JSON string into its PHP equivalent.
*
* @see drupal_json_encode()
- * @ingroup php_wrappers
+ * @ingroup php_wrappers
*/
function drupal_json_decode($var) {
// json_decode() does not unescape <, > and &, so we do it with str_replace().