summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Bergren2008-11-24 18:22:36 (GMT)
committer Brandon Bergren2008-11-24 18:22:36 (GMT)
commit61f1cc65d5516a5a01a50ee6ac41e56eb8d3dd1b (patch)
tree0dde422a05a5b02b64e2b6c33d4285fa045543c4
parentaa1fe9134e034518959615c0e7b6114af7246c16 (diff)
Do another variable check in preparation for the 5.x backport of the nov 24 commit.
-rw-r--r--location.install5
1 files changed, 5 insertions, 0 deletions
diff --git a/location.install b/location.install
index 9405e1b..268e8a0 100644
--- a/location.install
+++ b/location.install
@@ -1088,6 +1088,11 @@ function location_update_6305() {
* Add per-location-field weights and defaults.
*/
function location_update_6306() {
+ // Skip this update if it was already done on the 5.x side.
+ if (variable_get('location_update_5306_done', FALSE)) {
+ variable_del('location_update_5306_done');
+ return array();
+ }
$ret = array();
$result = db_query("SELECT name FROM {variable} WHERE name LIKE 'location_settings_%'");
while ($row = db_fetch_object($result)) {