diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-04-14 17:48:46 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-04-14 17:48:46 +0000 |
| commit | 56d2664a904119f73e7df4fb355e4c525e040b70 (patch) | |
| tree | 0ac2302d485b4b0769d269825880975428bd3b0c /includes/actions.inc | |
| parent | 46cda4c6ae388cd2e918ae2aec887e617e5bd44e (diff) | |
| download | brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.gz brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.bz2 | |
- Patch #245115 by kkaefer, John Morahan, JohnAlbin et al: after a long discussion we've decided to make the concatenation operator consistent with the other operators.
Diffstat (limited to 'includes/actions.inc')
| -rw-r--r-- | includes/actions.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/actions.inc b/includes/actions.inc index 8eeca815d..8811383a0 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -65,8 +65,8 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a if ($where) { $where_clause = implode(' ', $where); // Strip off leading 'OR '. - $where_clause = '('. strstr($where_clause, " ") .')'; - $result_db = db_query('SELECT * FROM {actions} WHERE '. $where_clause, $where_values); + $where_clause = '(' . strstr($where_clause, " ") . ')'; + $result_db = db_query('SELECT * FROM {actions} WHERE ' . $where_clause, $where_values); while ($action = db_fetch_object($result_db)) { $actions[$action->aid] = $action->parameters ? unserialize($action->parameters) : array(); $actions[$action->aid]['callback'] = $action->callback; |