From ee9c92139763c6c0d3be7f3156603a5de5382fc3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 21 Nov 2009 09:28:30 -0800
Subject: Don't use realpath when calculating the relative paths of embedded
 references in css files. This fixes ticket #910

---
 modules/gallery/libraries/Gallery_View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

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) . "')";
-- 
cgit v1.2.3


From 6bdb8c3d551cef6e2f12289ad4793ab106a4f7f3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 21 Nov 2009 09:35:38 -0800
Subject: Correct inconsistent captialization. Fixes #906

---
 modules/gallery/views/form_uploadify.html.php | 4 ++--
 modules/user/controllers/admin_users.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

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;
   }
 
-- 
cgit v1.2.3