diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-22 22:05:39 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-22 22:05:39 +0000 |
| commit | d39d7fb9ff7d071b8981e6c8caf74fffb9eb0218 (patch) | |
| tree | 5706bc0b4fc4fd4f5af5af108c32f1e000e5af9a | |
| parent | 33165e3915dc5d8f09583d70fca0441e17db905f (diff) | |
| download | nextcloud-server-d39d7fb9ff7d071b8981e6c8caf74fffb9eb0218.tar.gz nextcloud-server-d39d7fb9ff7d071b8981e6c8caf74fffb9eb0218.zip | |
Remove references to /apps/ and correct inclusion of settings
| -rw-r--r-- | apps/files_versions/appinfo/app.php | 4 | ||||
| -rw-r--r-- | apps/gallery/appinfo/app.php | 16 | ||||
| -rw-r--r-- | apps/gallery/index.php | 2 | ||||
| -rw-r--r-- | apps/media/appinfo/app.php | 6 | ||||
| -rwxr-xr-x | lib/app.php | 6 |
5 files changed, 17 insertions, 17 deletions
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index ef2f54dd3f9..bd06dc0ced3 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -1,6 +1,6 @@ <?php -require_once('apps/files_versions/versions.php'); +require_once('files_versions/versions.php'); OCP\App::registerAdmin('files_versions', 'settings'); OCP\App::registerPersonal('files_versions','settings-personal'); @@ -8,4 +8,4 @@ OCP\App::registerPersonal('files_versions','settings-personal'); OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals -OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook");
\ No newline at end of file +OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA_Versions\Storage", "write_hook"); diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php index e3a8dbd588b..df3b68ef736 100644 --- a/apps/gallery/appinfo/app.php +++ b/apps/gallery/appinfo/app.php @@ -21,13 +21,13 @@ * */ -OC::$CLASSPATH['OC_Gallery_Album'] = 'apps/gallery/lib/album.php'; -OC::$CLASSPATH['OC_Gallery_Photo'] = 'apps/gallery/lib/photo.php'; -OC::$CLASSPATH['OC_Gallery_Scanner'] = 'apps/gallery/lib/scanner.php'; -OC::$CLASSPATH['OC_Gallery_Sharing'] = 'apps/gallery/lib/sharing.php'; -OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'apps/gallery/lib/hooks_handlers.php'; -OC::$CLASSPATH['Pictures_Managers'] = 'apps/gallery/lib/managers.php'; -OC::$CLASSPATH['Pictures_Tiles'] = 'apps/gallery/lib/tiles.php'; +OC::$CLASSPATH['OC_Gallery_Album'] = 'gallery/lib/album.php'; +OC::$CLASSPATH['OC_Gallery_Photo'] = 'gallery/lib/photo.php'; +OC::$CLASSPATH['OC_Gallery_Scanner'] = 'gallery/lib/scanner.php'; +OC::$CLASSPATH['OC_Gallery_Sharing'] = 'gallery/lib/sharing.php'; +OC::$CLASSPATH['OC_Gallery_Hooks_Handlers'] = 'gallery/lib/hooks_handlers.php'; +OC::$CLASSPATH['Pictures_Managers'] = 'gallery/lib/managers.php'; +OC::$CLASSPATH['Pictures_Tiles'] = 'gallery/lib/tiles.php'; $l = OC_L10N::get('gallery'); @@ -52,4 +52,4 @@ class OC_GallerySearchProvider extends OC_Search_Provider{ //OC_Search::registerProvider('OC_GallerySearchProvider'); -require_once('apps/gallery/lib/hooks_handlers.php'); +require_once('gallery/lib/hooks_handlers.php'); diff --git a/apps/gallery/index.php b/apps/gallery/index.php index c08305bff9e..52a5b81a23a 100644 --- a/apps/gallery/index.php +++ b/apps/gallery/index.php @@ -31,7 +31,7 @@ OCP\Util::addStyle('files', 'files'); OCP\Util::addStyle('gallery', 'styles'); OCP\Util::addScript('gallery', 'pictures'); -include('apps/gallery/lib/tiles.php'); +include('gallery/lib/tiles.php'); $root = !empty($_GET['root']) ? $_GET['root'] : '/'; $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root); diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index 869bc344020..c5bfc346542 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -22,9 +22,9 @@ $l=OC_L10N::get('media'); -require_once('apps/media/lib_media.php'); -require_once('apps/media/lib_collection.php'); -require_once('apps/media/lib_scanner.php'); +require_once('media/lib_media.php'); +require_once('media/lib_collection.php'); +require_once('media/lib_scanner.php'); OCP\Util::addscript('media','loader'); OCP\App::registerPersonal('media','settings'); diff --git a/lib/app.php b/lib/app.php index 486704a2229..84d17957def 100755 --- a/lib/app.php +++ b/lib/app.php @@ -492,21 +492,21 @@ class OC_App{ * register a settings form to be shown */ public static function registerSettings($app,$page){ - self::$settingsForms[]='apps/'.$app.'/'.$page.'.php'; + self::$settingsForms[]= $app.'/'.$page.'.php'; } /** * register an admin form to be shown */ public static function registerAdmin($app,$page){ - self::$adminForms[]='apps/'.$app.'/'.$page.'.php'; + self::$adminForms[]= $app.'/'.$page.'.php'; } /** * register a personal form to be shown */ public static function registerPersonal($app,$page){ - self::$personalForms[]='apps/'.$app.'/'.$page.'.php'; + self::$personalForms[]= $app.'/'.$page.'.php'; } /** |