diff options
| author | 2013-11-10 19:45:48 +0100 | |
|---|---|---|
| committer | 2013-11-10 20:06:33 +0100 | |
| commit | 97c3c7575a586382ea87f8faa1e9e78afb64710a (patch) | |
| tree | 0f4fea481b45a459699ace0ed25467856b0b8a59 | |
| parent | b00fedba2576b7590b24ebb37795413c1fefa612 (diff) | |
Suppression des warnings liés à filemtime
ajout de "@" pour éviter les warnings, touch.txt sera créé un peu plus
tard
| -rw-r--r-- | app/App_FrontController.php | 10 | ||||
| -rwxr-xr-x | app/controllers/indexController.php | 4 | ||||
| -rwxr-xr-x | public/index.php | 10 |
3 files changed, 13 insertions, 11 deletions
diff --git a/app/App_FrontController.php b/app/App_FrontController.php index 82499ada3..5569d73a3 100644 --- a/app/App_FrontController.php +++ b/app/App_FrontController.php @@ -54,18 +54,18 @@ class App_FrontController extends FrontController { $theme = RSSThemes::get_infos($this->conf->theme()); if ($theme) { foreach($theme["files"] as $file) { - View::appendStyle (Url::display ('/themes/' . $theme['path'] . '/' . $file . '?' . filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file))); + View::appendStyle (Url::display ('/themes/' . $theme['path'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file))); } } - View::appendStyle (Url::display ('/themes/printer/style.css?' . filemtime(PUBLIC_PATH . '/themes/printer/style.css')), 'print'); + View::appendStyle (Url::display ('/themes/printer/style.css?' . @filemtime(PUBLIC_PATH . '/themes/printer/style.css')), 'print'); if (login_is_conf ($this->conf)) { View::appendScript ('https://login.persona.org/include.js'); } - View::appendScript (Url::display ('/scripts/jquery.min.js?' . filemtime(PUBLIC_PATH . '/scripts/jquery.min.js'))); + View::appendScript (Url::display ('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js'))); if ($this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) { - View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js?' . filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js'))); + View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js'))); } - View::appendScript (Url::display ('/scripts/main.js?' . filemtime(PUBLIC_PATH . '/scripts/main.js'))); + View::appendScript (Url::display ('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js'))); } private function loadNotifications () { diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index ee40ff9d2..2f86034ee 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -49,10 +49,10 @@ class indexController extends ActionController { Request::_param ('output', $output); } - View::appendScript (Url::display ('/scripts/shortcut.js?' . filemtime(PUBLIC_PATH . '/scripts/shortcut.js'))); + View::appendScript (Url::display ('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js'))); if ($output == 'global') { - View::appendScript (Url::display ('/scripts/global_view.js?' . filemtime(PUBLIC_PATH . '/scripts/global_view.js'))); + View::appendScript (Url::display ('/scripts/global_view.js?' . @filemtime(PUBLIC_PATH . '/scripts/global_view.js'))); } } diff --git a/public/index.php b/public/index.php index b5333c5c0..d3b752905 100755 --- a/public/index.php +++ b/public/index.php @@ -30,11 +30,13 @@ if (file_exists (PUBLIC_PATH . '/install.php')) { } else { session_cache_limiter(''); require (LIB_PATH . '/http-conditional.php'); - $dateLastModification = max(filemtime(PUBLIC_PATH . '/data/touch.txt'), + $dateLastModification = max( + @filemtime(PUBLIC_PATH . '/data/touch.txt'), @filemtime(LOG_PATH . '/application.log'), - filemtime(PUBLIC_PATH . '/data/Configuration.array.php'), - filemtime(APP_PATH . '/configuration/application.ini'), - time() - 14400); + @filemtime(PUBLIC_PATH . '/data/Configuration.array.php'), + @filemtime(APP_PATH . '/configuration/application.ini'), + time() - 14400 + ); if (httpConditional($dateLastModification, 0, 0, false, false, true)) { exit(); //No need to send anything } |
