feature 1502

Remove automatic file creation for local-layout.css during install or upgrade.php. Move icon/admin directory from default theme. git-svn-id: http://piwigo.org/svn/trunk@5124 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Mar 13, 2010 · 5958c85 · 5958c85
1 parent 14778ce
commit 5958c85
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 58 deletions.
diff --git 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
@@ -312,9 +312,6 @@
     @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
@@ -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
diff --git a/themes/default/icon/admin/errors.png → themes/default/icon/errors.png b/themes/default/icon/admin/errors.png → themes/default/icon/errors.png
diff --git a/themes/default/icon/admin/infos.png → themes/default/icon/infos.png b/themes/default/icon/admin/infos.png → themes/default/icon/infos.png
diff --git a/upgrade.php b/upgrade.php
@@ -292,9 +292,6 @@ function print_time($message)
       deactivate_non_standard_plugins();
     }
 
-    // Create empty local files to avoid log errors
-    create_empty_local_files();
-
     $page['upgrade_end'] = get_moment();
 
     $template->assign(