\n";
echo "\n";
echo " | \n";
- echo " ".$text['label-upgrade_svn'];
+ echo " ".$text['label-upgrade_source'];
echo " | \n";
echo " \n";
- echo " | \n";
echo "
\n";
@@ -267,16 +268,16 @@ echo "
";
echo "\n";
-// output result of svn update
-if (sizeof($_SESSION["response_svn_update"]) > 0) {
+// output result of source update
+if (sizeof($_SESSION["response_source_update"]) > 0) {
echo "
";
- echo "".$text['header-svn_update_results']."";
+ echo "".$text['header-source_update_results']."";
echo "
";
echo "";
- echo implode("\n", $_SESSION["response_svn_update"]);
+ echo implode("\n", $_SESSION["response_source_update"]);
echo "";
echo "
";
- unset($_SESSION["response_svn_update"]);
+ unset($_SESSION["response_source_update"]);
}
diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index 7ef1f2e8bd..0a882c14c1 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.php
@@ -38,7 +38,7 @@
include "root.php";
require_once "resources/require.php";
require_once "resources/check_auth.php";
- if (permission_exists('upgrade_schema') || permission_exists('upgrade_svn') || if_group("superadmin")) {
+ if (permission_exists('upgrade_schema') || permission_exists('upgrade_source') || if_group("superadmin")) {
//echo "access granted";
}
else {
diff --git a/resources/functions.php b/resources/functions.php
index 1c34a4ef43..1388857fec 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -1038,8 +1038,9 @@ function number_pad($number,$n) {
if ($file != '.' && $file != '..') {
$newpath = $dir.'/'.$file;
$level = explode('/',$newpath);
- if (substr($newpath, -4) == ".svn") {
- //ignore .svn dir and subdir
+ if (substr($newpath, -4) == ".svn" ||
+ substr($newpath, -4) == ".git") {
+ //ignore .svn and .git dir and subdir
}
else {
if (is_dir($newpath)) { //directories
diff --git a/resources/install.php b/resources/install.php
index c677a87e7a..e1f17ec155 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1745,7 +1745,7 @@ EOL;
$theme_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes';
if ($handle = opendir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes')) {
while (false !== ($dir_name = readdir($handle))) {
- if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && is_readable($theme_dir.'/'.$dir_name)) {
+ if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && $dir_name != ".git" && is_readable($theme_dir.'/'.$dir_name)) {
$dir_label = str_replace('_', ' ', $dir_name);
$dir_label = str_replace('-', ' ', $dir_label);
if ($dir_name == $install_template_name) {
diff --git a/resources/templates/engine/smarty/sysplugins/smarty_internal_cacheresource_file.php b/resources/templates/engine/smarty/sysplugins/smarty_internal_cacheresource_file.php
index 049cc91b6c..c27a873ae3 100644
--- a/resources/templates/engine/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/resources/templates/engine/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -180,7 +180,7 @@
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($_cache as $_file) {
- if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
+ if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false || strpos($_file, '.git') !== false) continue;
// directory ?
if ($_file->isDir()) {
if (!$_cache->isDot()) {
diff --git a/resources/templates/engine/smarty/sysplugins/smarty_internal_utility.php b/resources/templates/engine/smarty/sysplugins/smarty_internal_utility.php
index 33091eaf0f..5e763b7813 100644
--- a/resources/templates/engine/smarty/sysplugins/smarty_internal_utility.php
+++ b/resources/templates/engine/smarty/sysplugins/smarty_internal_utility.php
@@ -72,7 +72,7 @@ class Smarty_Internal_Utility
$_compile = new RecursiveIteratorIterator($_compileDirs);
foreach ($_compile as $_fileinfo) {
$_file = $_fileinfo->getFilename();
- if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
+ if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false || strpos($_file, '.git') !== false) continue;
if (!substr_compare($_file, $extension, - strlen($extension)) == 0) continue;
if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
$_template_file = $_file;
@@ -136,7 +136,7 @@ class Smarty_Internal_Utility
$_compile = new RecursiveIteratorIterator($_compileDirs);
foreach ($_compile as $_fileinfo) {
$_file = $_fileinfo->getFilename();
- if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
+ if (substr(basename($_fileinfo->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false || strpos($_file, '.git') !== false) continue;
if (!substr_compare($_file, $extension, - strlen($extension)) == 0) continue;
if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
$_config_file = $_file;
@@ -230,8 +230,7 @@ class Smarty_Internal_Utility
}
$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($_compile as $_file) {
- if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false)
- continue;
+ if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false || strpos($_file, '.git') !== false) continue;
$_filepath = (string) $_file;
diff --git a/themes/default/template.php b/themes/default/template.php
index cf908c72db..84990d386d 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -694,8 +694,9 @@ if (strlen($_SESSION['message']) > 0) {
if ($file != "." AND $file != ".."){
$new_path = $dir.'/'.$file;
$level = explode('/',$new_path);
- if (substr($new_path, -4) == ".svn") {
- //ignore .svn dir and subdir
+ if (substr($new_path, -4) == ".svn" ||
+ substr($new_path, -4) == ".git") {
+ //ignore .svn and .git dir and subdir
}
elseif (substr($new_path, -3) == ".db") {
//ignore .db files