adding tmp icon for app, extending memory size for php in .htaccess

diff --git a/.htaccess b/.htaccess
index 34c8a2345149c044a9badadeaf8a2e005e084463..8763a8bcde5c23897d4393d47430cc72241ea259 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,8 @@
-ErrorDocument 404 //owncloud/core/templates/404.php
+ErrorDocument 404 /owncloud/core/templates/404.php
 <IfModule mod_php5.c>
-       php_value upload_max_filesize 512M
-       php_value post_max_size 512M
-  php_value memory_limit 128M
-       SetEnv htaccessWorking true
+php_value upload_max_filesize 512M
+php_value post_max_size 512M
+php_value memory_limit 128M
+SetEnv htaccessWorking true
 </IfModule>
 Options -Indexes

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 2d5d2ce2154f7e4f3f1fe3f4a1c824569523a867..39fbd95fd2d5d9383d9c2a727507c79b33d5e3ba 100644 (file)
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -8,6 +8,6 @@ OC_App::addNavigationEntry( array(
  'id' => 'gallery_index',
  'order' => 20,
  'href' => OC_Helper::linkTo('gallery', 'index.php'),
- 'icon' => '',
+ 'icon' => OC_Helper::linkTo('', 'core/img/filetypes/image.png'),
  'name' => 'Gallery'));
 ?>