summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-09-27 12:06:35 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-09-27 12:06:35 -0700
commit5dedc4c400ec71e46a9ea641dd18c914b11c1096 (patch)
treeda71658e100676d8d144db9a2c1045c10e5ebe03 /modules/system
parent3eb1c0f675a8930678172fc867e94582189aad26 (diff)
downloadbrdo-5dedc4c400ec71e46a9ea641dd18c914b11c1096.tar.gz
brdo-5dedc4c400ec71e46a9ea641dd18c914b11c1096.tar.bz2
Issue #1226796 by sun, catch, Damien Tournoud: Fixed Not equal operator '!=' is not supported by all databases, must be '<>'.
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/system.admin.inc2
-rw-r--r--modules/system/system.api.php2
-rw-r--r--modules/system/system.module2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 37555d10b..12e28ff66 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -19,7 +19,7 @@ function system_admin_config_page() {
SELECT m.*, ml.*
FROM {menu_links} ml
INNER JOIN {menu_router} m ON ml.router_path = m.path
- WHERE ml.link_path != 'admin/help' AND menu_name = :menu_name AND ml.plid = :mlid AND hidden = 0", $admin, array('fetch' => PDO::FETCH_ASSOC));
+ WHERE ml.link_path <> 'admin/help' AND menu_name = :menu_name AND ml.plid = :mlid AND hidden = 0", $admin, array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $item) {
_menu_link_translate($item);
if (!$item['access']) {
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index f01c93f3d..9cc091b67 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -544,7 +544,7 @@ function hook_cron() {
// Long-running operation example, leveraging a queue:
// Fetch feeds from other sites.
- $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh != :never', array(
+ $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh <> :never', array(
':time' => REQUEST_TIME,
':never' => AGGREGATOR_CLEAR_NEVER,
));
diff --git a/modules/system/system.module b/modules/system/system.module
index 548911dfe..d0a542efb 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2912,7 +2912,7 @@ function system_get_module_admin_tasks($module, $info) {
->condition('ml.hidden', 0, '>=')
->condition('ml.module', 'system')
->condition('m.number_parts', 1, '>')
- ->condition('m.page_callback', 'system_admin_menu_block_page', '!=');
+ ->condition('m.page_callback', 'system_admin_menu_block_page', '<>');
foreach ($query->execute() as $link) {
_menu_link_translate($link);
if ($link['access']) {