diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-07-08 08:19:14 +0400 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-07-08 08:19:14 +0400 |
| commit | cd0cbab3731b988223e7ad44d78306e18fe3096c (patch) | |
| tree | 2681dc3b6ee7393c03dca36359a9c9bb8c22d63c /plugins/UserSettings | |
| parent | 9d95e1016eb204db445c263975f990b9d59d7f4d (diff) | |
fixes #803 - remove unnecessary require_once from core, plugins, and parts of
libs. (I didn't touch: open-flash-chart, Zend Framework, and PEAR HTML.)
Diffstat (limited to 'plugins/UserSettings')
| -rw-r--r-- | plugins/UserSettings/API.php | 2 | ||||
| -rw-r--r-- | plugins/UserSettings/Controller.php | 1 | ||||
| -rw-r--r-- | plugins/UserSettings/UserSettings.php | 2 | ||||
| -rw-r--r-- | plugins/UserSettings/functions.php | 10 |
4 files changed, 7 insertions, 8 deletions
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 2fe3717054..db5a52bdb6 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -9,7 +9,7 @@ * @package Piwik_UserSettings */ -require_once "UserSettings/functions.php"; +require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; /** * @package Piwik_UserSettings diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 5f24ae0844..2c95cd7006 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -9,7 +9,6 @@ * @package Piwik_UserSettings */ -require_once "ViewDataTable.php"; class Piwik_UserSettings_Controller extends Piwik_Controller { function index() diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index debc463e6d..6f3cc5505a 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -71,7 +71,7 @@ class Piwik_UserSettings extends Piwik_Plugin function archiveDay( $notification ) { - require_once "UserSettings/functions.php"; + require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; $archiveProcessing = $notification->getNotificationObject(); $this->archiveProcessing = $archiveProcessing; diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index 15d05cdec3..0389388e05 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -9,11 +9,11 @@ * @package Piwik_UserSettings */ -require_once "UserAgentParser/UserAgentParser.php"; +require_once PIWIK_INCLUDE_PATH . '/libs/UserAgentParser/UserAgentParser.php'; function Piwik_getPluginsLogo( $oldLabel ) { - return "plugins/UserSettings/images/plugins/". $oldLabel . ".gif"; + return 'plugins/UserSettings/images/plugins/'. $oldLabel . '.gif'; } function Piwik_getOSLabel($osId) @@ -122,18 +122,18 @@ function Piwik_getBrowserVersion($str) function Piwik_getBrowsersLogo($label) { $id = Piwik_getBrowserId($label); - return "plugins/UserSettings/images/browsers/". $id . ".gif"; + return 'plugins/UserSettings/images/browsers/'. $id . '.gif'; } function Piwik_getOSLogo($label) { - $path = "plugins/UserSettings/images/os/". $label . ".gif"; + $path = 'plugins/UserSettings/images/os/'. $label . '.gif'; return $path; } function Piwik_getScreensLogo($label) { - return "plugins/UserSettings/images/screens/" . $label . ".gif"; + return 'plugins/UserSettings/images/screens/' . $label . '.gif'; } function Piwik_UserSettings_keepStrlenGreater($value) |