summaryrefslogtreecommitdiff
path: root/actions/avatarsettings.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-01-27 22:07:04 -0500
committerCraig Andrews <candrews@integralblue.com>2010-01-27 22:07:04 -0500
commit914bc9f9c5ce29584e00553104ac991e6e178e7b (patch)
treeb473316af79d2c58c5ecd84765fcaa9725269fed /actions/avatarsettings.php
parente9995b0f6ab0788162e22c996e5ee0af416dd519 (diff)
parent9589985e29455e41ef915ff15b679fe2a01644a0 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: lib/queuemanager.php
Diffstat (limited to 'actions/avatarsettings.php')
-rw-r--r--actions/avatarsettings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index cf4525552..6a7398746 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -416,8 +416,8 @@ class AvatarsettingsAction extends AccountSettingsAction
parent::showScripts();
if ($this->mode == 'crop') {
- $this->script('js/jcrop/jquery.Jcrop.min.js');
- $this->script('js/jcrop/jquery.Jcrop.go.js');
+ $this->script('jcrop/jquery.Jcrop.min.js');
+ $this->script('jcrop/jquery.Jcrop.go.js');
}
$this->autofocus('avatarfile');