Commit c36b94c4 authored by Francois Marier's avatar Francois Marier

lib/upgrade: ignore CVS directories in plugin paths

This fixes installation of Mahara code taken from a local CVS.

LP: #605986
Signed-off-by: default avatarFrancois Marier <francois@catalyst.net.nz>
parent f168258f
......@@ -153,7 +153,7 @@ function check_upgrades($name=null) {
foreach ($pluginstocheck as $plugin) {
$dirhandle = opendir(get_config('docroot') . $plugin);
while (false !== ($dir = readdir($dirhandle))) {
if (strpos($dir, '.') === 0) {
if (strpos($dir, '.') === 0 or 'CVS' == $dir) {
continue;
}
if (!is_dir(get_config('docroot') . $plugin . '/' . $dir)) {
......@@ -174,7 +174,7 @@ function check_upgrades($name=null) {
}
$btdirhandle = opendir($btlocation);
while (false !== ($btdir = readdir($btdirhandle))) {
if (strpos($btdir, '.') === 0) {
if (strpos($btdir, '.') === 0 or 'CVS' == $btdir) {
continue;
}
if (!is_dir(get_config('docroot') . $plugin . '/' . $dir . '/blocktype/' . $btdir)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment