diff options
| -rw-r--r-- | admin/include/functions_upgrade.php | 20 | ||||
| -rw-r--r-- | install.php | 3 | ||||
| -rw-r--r-- | themes/default/default-colors.css | 4 | ||||
| -rw-r--r-- | themes/default/icon/admin/index.php | 30 | ||||
| -rw-r--r-- | themes/default/icon/errors.png (renamed from themes/default/icon/admin/errors.png) | bin | 3249 -> 3249 bytes | |||
| -rw-r--r-- | themes/default/icon/infos.png (renamed from themes/default/icon/admin/infos.png) | bin | 2250 -> 2250 bytes | |||
| -rw-r--r-- | upgrade.php | 3 |
7 files changed, 2 insertions, 58 deletions
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 10eedf20b..2afb6020e 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -68,26 +68,6 @@ function prepare_conf_upgrade() define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks'); } -// Create empty local files to avoid log errors -function create_empty_local_files() -{ - $files = - array ( - PHPWG_ROOT_PATH . 'template-common/local-layout.css', - PHPWG_ROOT_PATH . 'template/yoga/local-layout.css' - ); - - foreach ($files as $path) - { - if (!file_exists ($path)) - { - $file = @fopen($path, "w"); - @fwrite($file , '/* You can modify this file */'); - @fclose($file); - } - } -} - // Deactivate all non-standard plugins function deactivate_non_standard_plugins() { diff --git a/install.php b/install.php index 46943814c..fffb9f5f0 100644 --- a/install.php +++ b/install.php @@ -312,9 +312,6 @@ define(\'DB_COLLATE\', \'\'); @fputs($fp, $file_content, strlen($file_content)); @fclose($fp); - // Create empty local files to avoid log errors - create_empty_local_files(); - // tables creation, based on piwigo_structure.sql execute_sqlfile( PHPWG_ROOT_PATH.'install/piwigo_structure-'.$dblayer.'.sql', diff --git a/themes/default/default-colors.css b/themes/default/default-colors.css index cc094cf0e..8cd022867 100644 --- a/themes/default/default-colors.css +++ b/themes/default/default-colors.css @@ -51,7 +51,7 @@ INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rate font-weight: bold; margin: 5px; border: 1px solid red; - background-image: url(icon/admin/errors.png); + background-image: url(icon/errors.png); background-repeat: no-repeat; background-position: top right; padding: 10px 50px 10px 10px; @@ -63,7 +63,7 @@ INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rate .infos { color: #002000; background-color: #98fb98; /* palegreen */ - background-image: url(icon/admin/infos.png); + background-image: url(icon/infos.png); background-repeat: no-repeat; background-position: top right; margin: 5px; diff --git a/themes/default/icon/admin/index.php b/themes/default/icon/admin/index.php deleted file mode 100644 index 871b52b6a..000000000 --- a/themes/default/icon/admin/index.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -// +-----------------------------------------------------------------------+ -// | Piwigo - a PHP based picture gallery | -// +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2009 Piwigo Team http://piwigo.org | -// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | -// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ - -// Recursive call -$url = '../'; -header( 'Request-URI: '.$url ); -header( 'Content-Location: '.$url ); -header( 'Location: '.$url ); -exit(); -?> diff --git a/themes/default/icon/admin/errors.png b/themes/default/icon/errors.png Binary files differindex 3c8a37df5..3c8a37df5 100644 --- a/themes/default/icon/admin/errors.png +++ b/themes/default/icon/errors.png diff --git a/themes/default/icon/admin/infos.png b/themes/default/icon/infos.png Binary files differindex dc8c8a457..dc8c8a457 100644 --- a/themes/default/icon/admin/infos.png +++ b/themes/default/icon/infos.png diff --git a/upgrade.php b/upgrade.php index b661d5b84..df6704e45 100644 --- a/upgrade.php +++ b/upgrade.php @@ -292,9 +292,6 @@ if (isset($_POST['submit']) and check_upgrade()) deactivate_non_standard_plugins(); } - // Create empty local files to avoid log errors - create_empty_local_files(); - $page['upgrade_end'] = get_moment(); $template->assign( |
