Skip to content

Instantly share code, notes, and snippets.

View SupermanScott's full-sized avatar

Scott Reynolds SupermanScott

View GitHub Profile
diff --git a/html/sites/all/modules/contrib/ctools/js/dimensions.js b/html/sites/all/modules/contrib/ctools/js/dimensions.js
index 433f6cc..f352753 100644
--- a/html/sites/all/modules/contrib/ctools/js/dimensions.js
+++ b/html/sites/all/modules/contrib/ctools/js/dimensions.js
@@ -271,7 +271,7 @@
} else
parent = parent.offsetParent;
- if (parent && (parent.tagName.toLowerCase() == 'body' || parent.tagName.toLowerCase() == 'html')) {
+ if (parent && (parent[0].tagName.toLowerCase() == 'body' || parent[0].tagName.toLowerCase() == 'html')) {
diff --git a/html/sites/all/modules/contrib/ctools/includes/ajax.inc b/html/sites/all/modules/contrib/ctools/includes/ajax.inc
index f2a38f1..c891d69 100644
--- a/html/sites/all/modules/contrib/ctools/includes/ajax.inc
+++ b/html/sites/all/modules/contrib/ctools/includes/ajax.inc
@@ -451,6 +451,11 @@ function ctools_ajax_render($commands = array()) {
// them the first command.
global $conf;
$query_string = '?'. variable_get('css_js_query_string', '0');
+ $preprocessed = '';
+ $preprocess_js = (variable_get('preprocess_js', FALSE) && (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update'));
//fetches all JS src and concats them
// md5() the above
// On click / form submit add ID from above
diff --git a/html/sites/mothersclick.com/modules/custom/mc/mc.views.inc b/html/sites/mothersclick.com/modules/custom/mc/mc.views.inc
index 8ec1ab2..650c454 100644
--- a/html/sites/mothersclick.com/modules/custom/mc/mc.views.inc
+++ b/html/sites/mothersclick.com/modules/custom/mc/mc.views.inc
@@ -62,6 +62,7 @@ function mc_views_pre_render($view) {
'href' => 'node/' . $result->nid,
'fragment' => 'comment-' . $result->cid,
'title' => truncate_utf8(strip_tags($result->comment), 60, TRUE, TRUE),
+ 'html' => TRUE,
);
diff --git a/html/sites/all/modules/custom/share_post/share_post.module b/html/sites/all/modules/custom/share_post/share_post.module
index 1d89140..853abd2 100644
--- a/html/sites/all/modules/custom/share_post/share_post.module
+++ b/html/sites/all/modules/custom/share_post/share_post.module
@@ -68,8 +68,18 @@ function share_post_block($op = 'list', $delta = 0, $edit = array()) {
case 'view':
$block = array();
if ($delta == 'share_post') {
- $block['subject'] = t('Social links');
- $block['content'] = _share_posts();
function MY_MODULE_plugins_alter(&$plugins) {
$plugins['row']['node'] = array_merge(
$plugins['row']['node'],
array(
'handler' => 'my_new_handlers',
'path' => drupal_get_path('module', 'MY_MODULE') . '/views',
'parent' => 'node',
),
);
user]
name = Scott Reynolds
email = [email protected]
[color]
ui = auto
[pager]
status = true
show-branch = true
[alias]
st = status
diff --git a/html/sites/all/themes/rubik/cube/cube.info b/html/sites/all/themes/rubik/cube/cube.info
index 60985ca..92c5b40 100644
--- a/html/sites/all/themes/rubik/cube/cube.info
+++ b/html/sites/all/themes/rubik/cube/cube.info
@@ -11,7 +11,6 @@ stylesheets[screen][] = "style.css"
regions[header] = "Header"
regions[content] = "Content"
regions[left] = "Left"
-regions[admin_right] = "Right"
+regions[admin_right] = "Right"
diff --git semanticviews.theme.inc semanticviews.theme.inc
index fdd3e91..7421978 100644
--- semanticviews.theme.inc
+++ semanticviews.theme.inc
@@ -16,7 +16,7 @@ function template_preprocess_semanticviews_view_fields(&$vars) {
foreach ($view->field as $id => $field) {
// render this even if set to exclude so it can be used elsewhere.
$field_output = $view->style_plugin->get_field($view->row_index, $id);
- $empty = $field_output !== 0 && empty($field_output);
+ $empty = $field_output !== 0 && empty($view->result[$view->row_index]->{$field->field_alias});
diff --git a/html/sites/all/modules/contrib/notifications/notifications_content/notifications_content.module b/html/sites/all/modules/contrib/notifications/notifications_content
index de05eb9..e822396 100644
--- a/html/sites/all/modules/contrib/notifications/notifications_content/notifications_content.module
+++ b/html/sites/all/modules/contrib/notifications/notifications_content/notifications_content.module
@@ -727,7 +727,7 @@ function notifications_content_comment($comment, $op) {
// $comment can be an object or an array.
$comment = (object)$comment;
- if ($op == 'publish' && empty($comment->notifications_content_disable) && notifications_event_enabled('node-comment') &&
+ if ($op == 'insert' && empty($comment->notifications_content_disable) && notifications_event_enabled('node-comment') &&