diff options
| -rw-r--r-- | include/config.php | 9 | ||||
| -rw-r--r-- | view/js/mod_filestorage.js (renamed from view/js/mod_filestorage.php) | 0 | ||||
| -rw-r--r-- | view/js/mod_photos.js | 14 |
3 files changed, 7 insertions, 16 deletions
diff --git a/include/config.php b/include/config.php index 8d98d56fa..add7b5f71 100644 --- a/include/config.php +++ b/include/config.php @@ -25,14 +25,6 @@ function load_config($family) { $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); - // This is often one of the earliest database calls in the life of the page. - // If the DB was successfully opened, but we can't read from it, - // we must assume catastrophic failure of the DB. Report the system down. - -// if($r === false) { -// system_unavailable(); -// } - if($r !== false) { if($r) { foreach($r as $rr) { @@ -285,7 +277,6 @@ function load_xconfig($xchan,$family = '') { $a->config[$xchan][$c][$k] = $rr['v']; } } - } diff --git a/view/js/mod_filestorage.php b/view/js/mod_filestorage.js index 82957ae44..82957ae44 100644 --- a/view/js/mod_filestorage.php +++ b/view/js/mod_filestorage.js diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index f0a0de253..d9497af1e 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -4,14 +4,14 @@ var ispublic = aStr['everybody']; $(document).ready(function() { $("a#photos-upload-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + 'inline' : true, + 'transition' : 'elastic' + }); - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; |