Restructure things so that the application is now just another module.

Kohana makes this type of transition fairly straightforward in that
all controllers/helpers/etc are still located in the cascading
filesystem without any extra effort, except that I've temporarily
added a hack to force modules/gallery into the module path.

Rename what's left of "core" to be "application" so that it conforms
more closely to the Kohana standard (basically, just
application/config/config.php which is the minimal thing that you need
in the application directory)

There's still considerable work left to be done here.

167 files changed, 2 insertions, 1 deletions

diff --git a/core/config/config.php b/application/config/config.php
index 49b17908..92886dbe 100644
--- a/core/config/config.php
+++ b/application/config/config.php
@@ -119,6 +119,7 @@ $config['extension_prefix'] = 'MY_';
  */
 $config['modules'] = array(
   MODPATH . 'forge',
+  MODPATH . 'gallery',
 );
 
 if (TEST_MODE) {
diff --git a/index.php b/index.php
index 815ff5f5..4a531d5c 100644
--- a/index.php
+++ b/index.php
@@ -41,7 +41,7 @@ define('KOHANA',  'index.php');
 is_link(basename(__FILE__)) and chdir(dirname(realpath(__FILE__)));
 
 // Define application and system paths
-define('APPPATH', strtr(realpath('core') . '/', DIRECTORY_SEPARATOR, '/'));
+define('APPPATH', strtr(realpath('application') . '/', DIRECTORY_SEPARATOR, '/'));
 define('MODPATH', strtr(realpath('modules') . '/', DIRECTORY_SEPARATOR, '/'));
 define('THEMEPATH', strtr(realpath('themes') . '/', DIRECTORY_SEPARATOR, '/'));
 define('SYSPATH', strtr(realpath('kohana') . '/', DIRECTORY_SEPARATOR, '/'));
diff --git a/core/config/cookie.php b/modules/gallery/config/cookie.php
index 692ef548..692ef548 100644
--- a/core/config/cookie.php
+++ b/modules/gallery/config/cookie.php
diff --git a/core/config/database.php b/modules/gallery/config/database.php
index c20ccdb0..c20ccdb0 100644
--- a/core/config/database.php
+++ b/modules/gallery/config/database.php
diff --git a/core/config/locale.php b/modules/gallery/config/locale.php
index 4789dc2b..4789dc2b 100644
--- a/core/config/locale.php
+++ b/modules/gallery/config/locale.php
diff --git a/core/config/routes.php b/modules/gallery/config/routes.php
index 0272ca15..0272ca15 100644
--- a/core/config/routes.php
+++ b/modules/gallery/config/routes.php
diff --git a/core/config/sendmail.php b/modules/gallery/config/sendmail.php
index a4fa76ef..a4fa76ef 100644
--- a/core/config/sendmail.php
+++ b/modules/gallery/config/sendmail.php
diff --git a/core/config/session.php b/modules/gallery/config/session.php
index 990fa31f..990fa31f 100644
--- a/core/config/session.php
+++ b/modules/gallery/config/session.php
diff --git a/core/config/upload.php b/modules/gallery/config/upload.php
index 897ecacf..897ecacf 100644
--- a/core/config/upload.php
+++ b/modules/gallery/config/upload.php
diff --git a/core/controllers/admin.php b/modules/gallery/controllers/admin.php
index af0f387a..af0f387a 100644
--- a/core/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
diff --git a/core/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..79bc1183 100644
--- a/core/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
diff --git a/core/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index d2d2f79b..d2d2f79b 100644
--- a/core/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
diff --git a/core/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
index 0b3014f0..0b3014f0 100644
--- a/core/controllers/admin_graphics.php
+++ b/modules/gallery/controllers/admin_graphics.php
diff --git a/core/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 37d335a3..37d335a3 100644
--- a/core/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
diff --git a/core/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index c169de75..c169de75 100644
--- a/core/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
diff --git a/core/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index f7dd909d..f7dd909d 100644
--- a/core/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
diff --git a/core/controllers/admin_theme_details.php b/modules/gallery/controllers/admin_theme_details.php
index 542ec31c..542ec31c 100644
--- a/core/controllers/admin_theme_details.php
+++ b/modules/gallery/controllers/admin_theme_details.php
diff --git a/core/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 05c134d1..05c134d1 100644
--- a/core/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
diff --git a/core/controllers/after_install.php b/modules/gallery/controllers/after_install.php
index f066afe4..f066afe4 100644
--- a/core/controllers/after_install.php
+++ b/modules/gallery/controllers/after_install.php
diff --git a/core/controllers/albums.php b/modules/gallery/controllers/albums.php
index 5b4d5979..5b4d5979 100644
--- a/core/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
diff --git a/core/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index f3c5f109..f3c5f109 100644
--- a/core/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
diff --git a/core/controllers/items.php b/modules/gallery/controllers/items.php
index 13891726..13891726 100644
--- a/core/controllers/items.php
+++ b/modules/gallery/controllers/items.php
diff --git a/core/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 17520051..17520051 100644
--- a/core/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
diff --git a/core/controllers/maintenance.php b/modules/gallery/controllers/maintenance.php
index b5f39bed..b5f39bed 100644
--- a/core/controllers/maintenance.php
+++ b/modules/gallery/controllers/maintenance.php
diff --git a/core/controllers/move.php b/modules/gallery/controllers/move.php
index 130c247f..130c247f 100644
--- a/core/controllers/move.php
+++ b/modules/gallery/controllers/move.php
diff --git a/core/controllers/movies.php b/modules/gallery/controllers/movies.php
index 55bbb0e5..55bbb0e5 100644
--- a/core/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
diff --git a/core/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index b0cee303..b0cee303 100644
--- a/core/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
diff --git a/core/controllers/photos.php b/modules/gallery/controllers/photos.php
index 5d4040cf..5d4040cf 100644
--- a/core/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
diff --git a/core/controllers/quick.php b/modules/gallery/controllers/quick.php
index 643dce30..643dce30 100644
--- a/core/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
diff --git a/core/controllers/rest.php b/modules/gallery/controllers/rest.php
index 11a6bbac..11a6bbac 100644
--- a/core/controllers/rest.php
+++ b/modules/gallery/controllers/rest.php
diff --git a/core/controllers/scaffold.php b/modules/gallery/controllers/scaffold.php
index f0063725..f0063725 100644
--- a/core/controllers/scaffold.php
+++ b/modules/gallery/controllers/scaffold.php
diff --git a/core/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index bdf9582f..bdf9582f 100644
--- a/core/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
diff --git a/core/css/debug.css b/modules/gallery/css/debug.css
index fe5665ad..fe5665ad 100644
--- a/core/css/debug.css
+++ b/modules/gallery/css/debug.css
diff --git a/core/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 8973715f..8973715f 100644
--- a/core/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
diff --git a/core/css/quick.css b/modules/gallery/css/quick.css
index 02f9953e..02f9953e 100644
--- a/core/css/quick.css
+++ b/modules/gallery/css/quick.css
diff --git a/core/helpers/MY_remote.php b/modules/gallery/helpers/MY_remote.php
index 4abf5bf1..4abf5bf1 100644
--- a/core/helpers/MY_remote.php
+++ b/modules/gallery/helpers/MY_remote.php
diff --git a/core/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 81dcbe1e..81dcbe1e 100644
--- a/core/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
diff --git a/core/helpers/access.php b/modules/gallery/helpers/access.php
index 64ce91fa..64ce91fa 100644
--- a/core/helpers/access.php
+++ b/modules/gallery/helpers/access.php
diff --git a/core/helpers/album.php b/modules/gallery/helpers/album.php
index 362b93d0..362b93d0 100644
--- a/core/helpers/album.php
+++ b/modules/gallery/helpers/album.php
diff --git a/core/helpers/batch.php b/modules/gallery/helpers/batch.php
index 0faa3369..0faa3369 100644
--- a/core/helpers/batch.php
+++ b/modules/gallery/helpers/batch.php
diff --git a/core/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 022626e5..022626e5 100644
--- a/core/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
diff --git a/core/helpers/core.php b/modules/gallery/helpers/core.php
index 63f51f86..63f51f86 100644
--- a/core/helpers/core.php
+++ b/modules/gallery/helpers/core.php
diff --git a/core/helpers/core_block.php b/modules/gallery/helpers/core_block.php
index 0e2e9c54..0e2e9c54 100644
--- a/core/helpers/core_block.php
+++ b/modules/gallery/helpers/core_block.php
diff --git a/core/helpers/core_event.php b/modules/gallery/helpers/core_event.php
index bbb53cc9..bbb53cc9 100644
--- a/core/helpers/core_event.php
+++ b/modules/gallery/helpers/core_event.php
diff --git a/core/helpers/core_installer.php b/modules/gallery/helpers/core_installer.php
index cffcbedb..cffcbedb 100644
--- a/core/helpers/core_installer.php
+++ b/modules/gallery/helpers/core_installer.php
diff --git a/core/helpers/core_menu.php b/modules/gallery/helpers/core_menu.php
index eb208560..eb208560 100644
--- a/core/helpers/core_menu.php
+++ b/modules/gallery/helpers/core_menu.php
diff --git a/core/helpers/core_search.php b/modules/gallery/helpers/core_search.php
index 9957a493..9957a493 100644
--- a/core/helpers/core_search.php
+++ b/modules/gallery/helpers/core_search.php
diff --git a/core/helpers/core_task.php b/modules/gallery/helpers/core_task.php
index e078192c..e078192c 100644
--- a/core/helpers/core_task.php
+++ b/modules/gallery/helpers/core_task.php
diff --git a/core/helpers/core_theme.php b/modules/gallery/helpers/core_theme.php
index 28f544a1..28f544a1 100644
--- a/core/helpers/core_theme.php
+++ b/modules/gallery/helpers/core_theme.php
diff --git a/core/helpers/dir.php b/modules/gallery/helpers/dir.php
index 1717bdd9..1717bdd9 100644
--- a/core/helpers/dir.php
+++ b/modules/gallery/helpers/dir.php
diff --git a/core/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 805a95c0..805a95c0 100644
--- a/core/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
diff --git a/core/helpers/item.php b/modules/gallery/helpers/item.php
index 7daaf1e1..7daaf1e1 100644
--- a/core/helpers/item.php
+++ b/modules/gallery/helpers/item.php
diff --git a/core/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index ec4c5429..ec4c5429 100644
--- a/core/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
diff --git a/core/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 80b6f01c..80b6f01c 100644
--- a/core/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
diff --git a/core/helpers/locale.php b/modules/gallery/helpers/locale.php
index b707637f..b707637f 100644
--- a/core/helpers/locale.php
+++ b/modules/gallery/helpers/locale.php
diff --git a/core/helpers/log.php b/modules/gallery/helpers/log.php
index 451f985a..451f985a 100644
--- a/core/helpers/log.php
+++ b/modules/gallery/helpers/log.php
diff --git a/core/helpers/message.php b/modules/gallery/helpers/message.php
index af3b96cc..af3b96cc 100644
--- a/core/helpers/message.php
+++ b/modules/gallery/helpers/message.php
diff --git a/core/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index 2649fdbd..2649fdbd 100644
--- a/core/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
diff --git a/core/helpers/module.php b/modules/gallery/helpers/module.php
index a48c89ed..a48c89ed 100644
--- a/core/helpers/module.php
+++ b/modules/gallery/helpers/module.php
diff --git a/core/helpers/movie.php b/modules/gallery/helpers/movie.php
index 3293d4ac..3293d4ac 100644
--- a/core/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
diff --git a/core/helpers/photo.php b/modules/gallery/helpers/photo.php
index c1c005f5..c1c005f5 100644
--- a/core/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
diff --git a/core/helpers/rest.php b/modules/gallery/helpers/rest.php
index a63b94c8..a63b94c8 100644
--- a/core/helpers/rest.php
+++ b/modules/gallery/helpers/rest.php
diff --git a/core/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 6d47e565..6d47e565 100644
--- a/core/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
diff --git a/core/helpers/task.php b/modules/gallery/helpers/task.php
index a8a004ab..a8a004ab 100644
--- a/core/helpers/task.php
+++ b/modules/gallery/helpers/task.php
diff --git a/core/helpers/theme.php b/modules/gallery/helpers/theme.php
index cbe224db..cbe224db 100644
--- a/core/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
diff --git a/core/helpers/xml.php b/modules/gallery/helpers/xml.php
index e734e90c..e734e90c 100644
--- a/core/helpers/xml.php
+++ b/modules/gallery/helpers/xml.php
diff --git a/core/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index 2c36795a..2c36795a 100644
--- a/core/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
diff --git a/core/images/gallery.png b/modules/gallery/images/gallery.png
index ca8e0e95..ca8e0e95 100644
--- a/core/images/gallery.png
+++ b/modules/gallery/images/gallery.png
diff --git a/core/images/gd.png b/modules/gallery/images/gd.png
index b341d71c..b341d71c 100644
--- a/core/images/gd.png
+++ b/modules/gallery/images/gd.png
diff --git a/core/images/graphicsmagick.png b/modules/gallery/images/graphicsmagick.png
index 3d1d77e9..3d1d77e9 100644
--- a/core/images/graphicsmagick.png
+++ b/modules/gallery/images/graphicsmagick.png
diff --git a/core/images/imagemagick.jpg b/modules/gallery/images/imagemagick.jpg
index d83c4509..d83c4509 100644
--- a/core/images/imagemagick.jpg
+++ b/modules/gallery/images/imagemagick.jpg
diff --git a/core/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js
index 06a364f3..06a364f3 100644
--- a/core/js/albums_form_add.js
+++ b/modules/gallery/js/albums_form_add.js
diff --git a/core/js/fullsize.js b/modules/gallery/js/fullsize.js
index 7428adb5..7428adb5 100644
--- a/core/js/fullsize.js
+++ b/modules/gallery/js/fullsize.js
diff --git a/core/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f43671f1..f43671f1 100644
--- a/core/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
diff --git a/core/js/quick.js b/modules/gallery/js/quick.js
index e7f35cea..e7f35cea 100644
--- a/core/js/quick.js
+++ b/modules/gallery/js/quick.js
diff --git a/core/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index acc3f8ec..acc3f8ec 100644
--- a/core/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
diff --git a/core/libraries/Block.php b/modules/gallery/libraries/Block.php
index 6fe679f1..6fe679f1 100644
--- a/core/libraries/Block.php
+++ b/modules/gallery/libraries/Block.php
diff --git a/core/libraries/I18n.php b/modules/gallery/libraries/I18n.php
index c936be88..c936be88 100644
--- a/core/libraries/I18n.php
+++ b/modules/gallery/libraries/I18n.php
diff --git a/core/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index c56f16e8..c56f16e8 100644
--- a/core/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
diff --git a/core/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
index 17d0465b..17d0465b 100644
--- a/core/libraries/MY_Forge.php
+++ b/modules/gallery/libraries/MY_Forge.php
diff --git a/core/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index fb2f80a7..fb2f80a7 100644
--- a/core/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
diff --git a/core/libraries/MY_Pagination.php b/modules/gallery/libraries/MY_Pagination.php
index d06a974f..d06a974f 100644
--- a/core/libraries/MY_Pagination.php
+++ b/modules/gallery/libraries/MY_Pagination.php
diff --git a/core/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 836d1087..836d1087 100644
--- a/core/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
diff --git a/core/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index d19d8b1e..d19d8b1e 100644
--- a/core/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
diff --git a/core/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 46280d95..46280d95 100644
--- a/core/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
diff --git a/core/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 90998457..90998457 100644
--- a/core/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
diff --git a/core/libraries/Task_Definition.php b/modules/gallery/libraries/Task_Definition.php
index 8d9c5922..8d9c5922 100644
--- a/core/libraries/Task_Definition.php
+++ b/modules/gallery/libraries/Task_Definition.php
diff --git a/core/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index b5b97666..b5b97666 100644
--- a/core/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
diff --git a/core/models/access_cache.php b/modules/gallery/models/access_cache.php
index 10d05df7..10d05df7 100644
--- a/core/models/access_cache.php
+++ b/modules/gallery/models/access_cache.php
diff --git a/core/models/access_intent.php b/modules/gallery/models/access_intent.php
index 86cda7b3..86cda7b3 100644
--- a/core/models/access_intent.php
+++ b/modules/gallery/models/access_intent.php
diff --git a/core/models/graphics_rule.php b/modules/gallery/models/graphics_rule.php
index 2b5a8968..2b5a8968 100644
--- a/core/models/graphics_rule.php
+++ b/modules/gallery/models/graphics_rule.php
diff --git a/core/models/incoming_translation.php b/modules/gallery/models/incoming_translation.php
index 0c9a343f..0c9a343f 100644
--- a/core/models/incoming_translation.php
+++ b/modules/gallery/models/incoming_translation.php
diff --git a/core/models/item.php b/modules/gallery/models/item.php
index 4b8cac8e..4b8cac8e 100644
--- a/core/models/item.php
+++ b/modules/gallery/models/item.php
diff --git a/core/models/log.php b/modules/gallery/models/log.php
index 6734afb8..6734afb8 100644
--- a/core/models/log.php
+++ b/modules/gallery/models/log.php
diff --git a/core/models/message.php b/modules/gallery/models/message.php
index 851ececa..851ececa 100644
--- a/core/models/message.php
+++ b/modules/gallery/models/message.php
diff --git a/core/models/module.php b/modules/gallery/models/module.php
index 5a9ea5bd..5a9ea5bd 100644
--- a/core/models/module.php
+++ b/modules/gallery/models/module.php
diff --git a/core/models/outgoing_translation.php b/modules/gallery/models/outgoing_translation.php
index bf617f42..bf617f42 100644
--- a/core/models/outgoing_translation.php
+++ b/modules/gallery/models/outgoing_translation.php
diff --git a/core/models/permission.php b/modules/gallery/models/permission.php
index e77fa5bd..e77fa5bd 100644
--- a/core/models/permission.php
+++ b/modules/gallery/models/permission.php
diff --git a/core/models/task.php b/modules/gallery/models/task.php
index 9e3ae5c6..9e3ae5c6 100644
--- a/core/models/task.php
+++ b/modules/gallery/models/task.php
diff --git a/core/models/theme.php b/modules/gallery/models/theme.php
index f479fd5a..f479fd5a 100644
--- a/core/models/theme.php
+++ b/modules/gallery/models/theme.php
diff --git a/core/models/var.php b/modules/gallery/models/var.php
index 434370e9..434370e9 100644
--- a/core/models/var.php
+++ b/modules/gallery/models/var.php
diff --git a/core/module.info b/modules/gallery/module.info
index ff7da82d..ff7da82d 100644
--- a/core/module.info
+++ b/modules/gallery/module.info
diff --git a/core/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 7012a487..7012a487 100644
--- a/core/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
diff --git a/core/tests/Album_Helper_Test.php b/modules/gallery/tests/Album_Helper_Test.php
index 80afa8d1..80afa8d1 100644
--- a/core/tests/Album_Helper_Test.php
+++ b/modules/gallery/tests/Album_Helper_Test.php
diff --git a/core/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index ef1fac77..ef1fac77 100644
--- a/core/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
diff --git a/core/tests/Core_Installer_Test.php b/modules/gallery/tests/Core_Installer_Test.php
index f7036286..f7036286 100644
--- a/core/tests/Core_Installer_Test.php
+++ b/modules/gallery/tests/Core_Installer_Test.php
diff --git a/core/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index bd3d2f53..bd3d2f53 100644
--- a/core/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
diff --git a/core/tests/Dir_Helper_Test.php b/modules/gallery/tests/Dir_Helper_Test.php
index 46bb871c..46bb871c 100644
--- a/core/tests/Dir_Helper_Test.php
+++ b/modules/gallery/tests/Dir_Helper_Test.php
diff --git a/core/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 2c5aaba4..2c5aaba4 100644
--- a/core/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
diff --git a/core/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 1caa82ba..1caa82ba 100644
--- a/core/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
diff --git a/core/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index 9010606a..9010606a 100644
--- a/core/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
diff --git a/core/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 615b8997..615b8997 100644
--- a/core/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
diff --git a/core/tests/Menu_Test.php b/modules/gallery/tests/Menu_Test.php
index c91aee0b..c91aee0b 100644
--- a/core/tests/Menu_Test.php
+++ b/modules/gallery/tests/Menu_Test.php
diff --git a/core/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
index b92ef3f8..b92ef3f8 100644
--- a/core/tests/Movie_Helper_Test.php
+++ b/modules/gallery/tests/Movie_Helper_Test.php
diff --git a/core/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 200c8a74..200c8a74 100644
--- a/core/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
diff --git a/core/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index deb11bb9..deb11bb9 100644
--- a/core/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
diff --git a/core/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 71319315..71319315 100644
--- a/core/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
diff --git a/core/tests/REST_Controller_Test.php b/modules/gallery/tests/REST_Controller_Test.php
index 8fb04d86..8fb04d86 100644
--- a/core/tests/REST_Controller_Test.php
+++ b/modules/gallery/tests/REST_Controller_Test.php
diff --git a/core/tests/REST_Helper_Test.php b/modules/gallery/tests/REST_Helper_Test.php
index 1bfc63ab..1bfc63ab 100644
--- a/core/tests/REST_Helper_Test.php
+++ b/modules/gallery/tests/REST_Helper_Test.php
diff --git a/core/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index 64c1fff0..64c1fff0 100644
--- a/core/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
diff --git a/core/tests/Var_Test.php b/modules/gallery/tests/Var_Test.php
index 82370631..82370631 100644
--- a/core/tests/Var_Test.php
+++ b/modules/gallery/tests/Var_Test.php
diff --git a/core/tests/images/DSC_0003.jpg b/modules/gallery/tests/images/DSC_0003.jpg
index 5780d9d8..5780d9d8 100644
--- a/core/tests/images/DSC_0003.jpg
+++ b/modules/gallery/tests/images/DSC_0003.jpg
diff --git a/core/tests/images/DSC_0005.jpg b/modules/gallery/tests/images/DSC_0005.jpg
index 4d2b53a9..4d2b53a9 100644
--- a/core/tests/images/DSC_0005.jpg
+++ b/modules/gallery/tests/images/DSC_0005.jpg
diff --git a/core/tests/images/DSC_0017.jpg b/modules/gallery/tests/images/DSC_0017.jpg
index b7f7bb90..b7f7bb90 100644
--- a/core/tests/images/DSC_0017.jpg
+++ b/modules/gallery/tests/images/DSC_0017.jpg
diff --git a/core/tests/images/DSC_0019.jpg b/modules/gallery/tests/images/DSC_0019.jpg
index 0ce25aa4..0ce25aa4 100644
--- a/core/tests/images/DSC_0019.jpg
+++ b/modules/gallery/tests/images/DSC_0019.jpg
diff --git a/core/tests/images/DSC_0067.jpg b/modules/gallery/tests/images/DSC_0067.jpg
index 84f134cb..84f134cb 100644
--- a/core/tests/images/DSC_0067.jpg
+++ b/modules/gallery/tests/images/DSC_0067.jpg
diff --git a/core/tests/images/DSC_0072.jpg b/modules/gallery/tests/images/DSC_0072.jpg
index dfad82b0..dfad82b0 100644
--- a/core/tests/images/DSC_0072.jpg
+++ b/modules/gallery/tests/images/DSC_0072.jpg
diff --git a/core/tests/images/P4050088.jpg b/modules/gallery/tests/images/P4050088.jpg
index 62f4749d..62f4749d 100644
--- a/core/tests/images/P4050088.jpg
+++ b/modules/gallery/tests/images/P4050088.jpg
diff --git a/core/tests/selenium/Add_Album.html b/modules/gallery/tests/selenium/Add_Album.html
index ccd4d0b7..ccd4d0b7 100644
--- a/core/tests/selenium/Add_Album.html
+++ b/modules/gallery/tests/selenium/Add_Album.html
diff --git a/core/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html
index b4b96ed2..b4b96ed2 100644
--- a/core/tests/selenium/Add_Comment.html
+++ b/modules/gallery/tests/selenium/Add_Comment.html
diff --git a/core/tests/selenium/Add_Item.html b/modules/gallery/tests/selenium/Add_Item.html
index 741dff65..741dff65 100644
--- a/core/tests/selenium/Add_Item.html
+++ b/modules/gallery/tests/selenium/Add_Item.html
diff --git a/core/tests/selenium/Login.html b/modules/gallery/tests/selenium/Login.html
index 5e17a3c7..5e17a3c7 100644
--- a/core/tests/selenium/Login.html
+++ b/modules/gallery/tests/selenium/Login.html
diff --git a/core/tests/test.jpg b/modules/gallery/tests/test.jpg
index 1f3525e5..1f3525e5 100644
--- a/core/tests/test.jpg
+++ b/modules/gallery/tests/test.jpg
diff --git a/core/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 1f3825bd..1f3825bd 100644
--- a/core/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
diff --git a/core/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index db6313e1..db6313e1 100644
--- a/core/views/admin_block_log_entries.html.php
+++ b/modules/gallery/views/admin_block_log_entries.html.php
diff --git a/core/views/admin_block_news.html.php b/modules/gallery/views/admin_block_news.html.php
index cb276ae5..cb276ae5 100644
--- a/core/views/admin_block_news.html.php
+++ b/modules/gallery/views/admin_block_news.html.php
diff --git a/core/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index e8a4d933..e8a4d933 100644
--- a/core/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
diff --git a/core/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index 6b79f047..6b79f047 100644
--- a/core/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
diff --git a/core/views/admin_block_stats.html.php b/modules/gallery/views/admin_block_stats.html.php
index 2d975073..2d975073 100644
--- a/core/views/admin_block_stats.html.php
+++ b/modules/gallery/views/admin_block_stats.html.php
diff --git a/core/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index 488fa908..488fa908 100644
--- a/core/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
diff --git a/core/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index c266d7e1..c266d7e1 100644
--- a/core/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
diff --git a/core/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 08374471..08374471 100644
--- a/core/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
diff --git a/core/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index cae68b74..cae68b74 100644
--- a/core/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
diff --git a/core/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 720a9459..720a9459 100644
--- a/core/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
diff --git a/core/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index c7468eed..c7468eed 100644
--- a/core/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
diff --git a/core/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index 5306a70d..5306a70d 100644
--- a/core/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
diff --git a/core/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 2b43f1b4..2b43f1b4 100644
--- a/core/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
diff --git a/core/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index bc060a7b..bc060a7b 100644
--- a/core/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
diff --git a/core/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 1ee02311..1ee02311 100644
--- a/core/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
diff --git a/core/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 3fddd6cd..3fddd6cd 100644
--- a/core/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
diff --git a/core/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_details.html.php
index eb450b16..eb450b16 100644
--- a/core/views/admin_theme_details.html.php
+++ b/modules/gallery/views/admin_theme_details.html.php
diff --git a/core/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index f85bce70..f85bce70 100644
--- a/core/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
diff --git a/core/views/admin_themes_preview.html.php b/modules/gallery/views/admin_themes_preview.html.php
index a7aea172..a7aea172 100644
--- a/core/views/admin_themes_preview.html.php
+++ b/modules/gallery/views/admin_themes_preview.html.php
diff --git a/core/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index aa26858a..aa26858a 100644
--- a/core/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
diff --git a/core/views/after_install_loader.html.php b/modules/gallery/views/after_install_loader.html.php
index baf91eed..baf91eed 100644
--- a/core/views/after_install_loader.html.php
+++ b/modules/gallery/views/after_install_loader.html.php
diff --git a/core/views/form.html.php b/modules/gallery/views/form.html.php
index ec2a56a9..ec2a56a9 100644
--- a/core/views/form.html.php
+++ b/modules/gallery/views/form.html.php
diff --git a/core/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index d9bf9698..d9bf9698 100644
--- a/core/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
diff --git a/core/views/kohana_profiler.php b/modules/gallery/views/kohana_profiler.php
index c7534349..c7534349 100644
--- a/core/views/kohana_profiler.php
+++ b/modules/gallery/views/kohana_profiler.php
diff --git a/core/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 8f4092c7..8f4092c7 100644
--- a/core/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
diff --git a/core/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index f80b6e7a..f80b6e7a 100644
--- a/core/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
diff --git a/core/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index 4f69c0e9..4f69c0e9 100644
--- a/core/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
diff --git a/core/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index a3a4bc8f..a3a4bc8f 100644
--- a/core/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
diff --git a/core/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index afd87c2b..afd87c2b 100644
--- a/core/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
diff --git a/core/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index 3dbd0d98..3dbd0d98 100644
--- a/core/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
diff --git a/core/views/quick_pane.html.php b/modules/gallery/views/quick_pane.html.php
index 95de972b..95de972b 100644
--- a/core/views/quick_pane.html.php
+++ b/modules/gallery/views/quick_pane.html.php
diff --git a/core/views/scaffold.html.php b/modules/gallery/views/scaffold.html.php
index 765464b5..765464b5 100644
--- a/core/views/scaffold.html.php
+++ b/modules/gallery/views/scaffold.html.php
diff --git a/core/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index b6725c31..b6725c31 100644
--- a/core/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php