- Patch #105454 by kkaefer, ChrisKennedy, RobRoy et al: fixed update paths.

2 files changed, 4 insertions, 4 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 4aac8d1a9..5f8262c44 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -942,9 +942,9 @@ function form_select_options($element, $choices = NULL) {
 }
 
 /**
- * Traverses a select element's #option array looking for the object that 
+ * Traverses a select element's #option array looking for the object that
  * holds the given key. Returns FALSE if not found. As usual with functions
- * that can return 0 or FALSE do not forget to use === and !== if needed. 
+ * that can return 0 or FALSE do not forget to use === and !== if needed.
  *
  * @param $element
  *   The select element.
diff --git a/modules/system/system.install b/modules/system/system.install
index e2a6a2918..c21aec25c 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1605,7 +1605,7 @@ function system_update_132() {
       /**
        * Wipe the search index
        */
-      include_once './modules/search.module';
+      include_once './'. drupal_get_path('module', 'search') .'/search.module';
       search_wipe();
     }
 
@@ -2625,7 +2625,7 @@ function system_update_172() {
     $_SESSION['system_update_172_max'] = db_result(db_query('SELECT MAX(cid) FROM {comments}'));
   }
 
-  include_once './modules/comment.module';
+  include_once './'. drupal_get_path('module', 'comment') .'/comment.module';
 
   $limit = 20;
   $result = db_query_range("SELECT cid, thread FROM {comments} WHERE cid > %d ORDER BY cid ASC", $_SESSION['system_update_172'], 0, $limit);