diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-21 11:36:27 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-21 11:36:27 -0800 |
| commit | 38233c67a2946d6fe7b6457217541c796247285d (patch) | |
| tree | f4b8860c6ae6c8b0846f65f65bb9b56188c0758e | |
| parent | d6695e83e245d3d478ba4ecf1e3a2a5bb52665d3 (diff) | |
| parent | 5e57346040629393c08777ae129044bb7ed08a37 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/libraries/Gallery_View.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 4 | ||||
| -rw-r--r-- | modules/user/controllers/admin_users.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php index bdfd2fc9..3bf56d0f 100644 --- a/modules/gallery/libraries/Gallery_View.php +++ b/modules/gallery/libraries/Gallery_View.php @@ -125,7 +125,7 @@ class Gallery_View_Core extends View { if (preg_match_all($PATTERN, $css, $matches, PREG_SET_ORDER)) { $search = $replace = array(); foreach ($matches as $match) { - $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length); + $relative = dirname($css_file) . "/$match[1]"; if (!empty($relative)) { $search[] = $match[0]; $replace[] = "url('" . url::abs_file($relative) . "')"; diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 7448db84..5e99c8d5 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -23,7 +23,7 @@ fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", fileDesc: <?= t("Photos and movies")->for_js() ?>, cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>", - buttonText: <?= t("Select Photos ...")->for_js() ?>, + buttonText: <?= t("Select photos...")->for_js() ?>, simUploadLimit: 10, wmode: "transparent", hideButton: true, /* should be true */ @@ -114,7 +114,7 @@ </div> <div id="g-add-photos-canvas" style="text-align: center;"> - <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select Photos...") ?></a> + <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select photos...") ?></a> <span id="g-uploadify"></span> </div> <div id="g-add-photos-status" style="text-align: center;"> diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index cc2d881e..b3284385 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -340,7 +340,7 @@ class Admin_Users_Controller extends Admin_Controller { ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]"); module::event("user_add_form_admin", $user, $form); - $group->submit("")->value(t("Add User")); + $group->submit("")->value(t("Add user")); return $form; } |