Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix warnings during install #7

Closed
wants to merge 3 commits into from

2 participants

@notbenh

Attempting to do a local install to an leonovo x200 running LMDE, kept getting a bunch of warnings that seemed skippable. As this is my first experience with drupal I'm not yet able to dig in and understand why the errors are tripped though many seemed like failure to check for faulty assumptions. Install was using SQLite, php5 :

php --version
PHP 5.4.0-3 (cli) (built: Mar 22 2012 07:59:57)
Copyright (c) 1997-2012 The PHP Group
Zend Engine v2.4.0, Copyright (c) 1998-2012 Zend Technologies

sqlite3 --version
3.7.10 2012-01-16 13:28:40 ebd01a8deffb5024a5d7494eef800d2366d97204

@mikl
Owner

This repo is just a mirror of the offical one which is located on drupal.org. We'd love to have you participate in the issue queue, where all code changes are discussed: http://drupal.org/project/issues/drupal?categories=All

@mikl mikl closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 28, 2012
  1. fixing warnings during install profile of install, though more likely…

    ben hengst authored
    … leak from db create
  2. really?!?

    ben hengst authored
  3. sloppy checking here too

    ben hengst authored
This page is out of date. Refresh to see the latest.
View
2  includes/database/query.inc
@@ -1898,7 +1898,7 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
function __clone() {
$this->changed = TRUE;
foreach ($this->conditions as $key => $condition) {
- if ($condition['field'] instanceOf QueryConditionInterface) {
+ if (is_array($condition) && array_key_exists('feild',$condition) && $condition['field'] instanceOf QueryConditionInterface) {
$this->conditions[$key]['field'] = clone($condition['field']);
}
}
View
12 includes/database/sqlite/query.inc
@@ -72,11 +72,13 @@ class UpdateQuery_sqlite extends UpdateQuery {
*/
protected function removeFieldsInCondition(&$fields, QueryConditionInterface $condition) {
foreach ($condition->conditions() as $child_condition) {
- if ($child_condition['field'] instanceof QueryConditionInterface) {
- $this->removeFieldsInCondition($fields, $child_condition['field']);
- }
- else {
- unset($fields[$child_condition['field']]);
+ if (is_array($child_condition) && array_key_exists('feild',$child_condition) ) {
+ if ($child_condition['field'] instanceof QueryConditionInterface) {
+ $this->removeFieldsInCondition($fields, $child_condition['field']);
+ }
+ else {
+ unset($fields[$child_condition['field']]);
+ }
}
}
}
View
2  includes/menu.inc
@@ -3152,7 +3152,7 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a
// array_intersect_assoc() with the $item as the first parameter because
// $item may have additional keys left over from building a router entry.
// The intersect removes the extra keys, allowing a meaningful comparison.
- if (!$existing_item || (array_intersect_assoc($item, $existing_item)) != $existing_item) {
+ if ($item!=$existing_item) {
db_update('menu_links')
->fields(array(
'menu_name' => $item['menu_name'],
Something went wrong with that request. Please try again.