From 25927c42ce4addae682fac331bfaddfb166d15bf Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 1 May 2013 10:51:32 +0800
Subject: [PATCH] MDL-39312 Cache lock plugins - fix undefined var and language
 typo

---
 cache/locallib.php | 2 +-
 lang/en/cache.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cache/locallib.php b/cache/locallib.php
index 45e570028bf..617ac7dbedc 100644
--- a/cache/locallib.php
+++ b/cache/locallib.php
@@ -936,7 +936,7 @@ abstract class cache_administration_helper extends cache_helper {
         $url = new moodle_url('/cache/admin.php', array('action' => 'editstore', 'plugin' => $plugin, 'store' => $store));
         $editform = new $class($url, array('plugin' => $plugin, 'store' => $store, 'locks' => $locks));
         if (isset($stores[$store]['lock'])) {
-            $editform->set_data(array('lock' => $lock));
+            $editform->set_data(array('lock' => $stores[$store]['lock']));
         }
         // See if the cachestore is going to want to load data for the form.
         // If it has a customised add instance form then it is going to want to.
diff --git a/lang/en/cache.php b/lang/en/cache.php
index 8b4a45a2f0b..0c9686d152c 100644
--- a/lang/en/cache.php
+++ b/lang/en/cache.php
@@ -98,7 +98,7 @@ $string['lockingmeans'] = 'Locking mechanism';
 $string['lockmethod'] = 'Lock method';
 $string['lockmethod_help'] = 'This is the method used for locking when required of this store.';
 $string['lockname'] = 'Name';
-$string['locknamedesc'] = 'The name must be unique and can on consist of the characters: a-zA-Z_';
+$string['locknamedesc'] = 'The name must be unique and can only consist of the characters: a-zA-Z_';
 $string['locknamenotunique'] = 'The name you have selected is not unique. Please select a unique name.';
 $string['locksummary'] = 'Summary of cache lock instances.';
 $string['locktype'] = 'Type';