From 9d40f6fc0055d21725878ceaddc0fd079cb8b732 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 20 Nov 2009 20:29:49 -0800 Subject: Paginator: don't try to set the position for "other" page types. --- modules/gallery/libraries/Theme_View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/libraries') diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index b1167d0e..b64deab9 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -172,7 +172,7 @@ class Theme_View_Core extends Gallery_View { $v->first_visible_position = ($this->page - 1) * $this->page_size + 1; $v->last_visible_position = min($this->page * $this->page_size, $v->total); - } else { + } else if ($this->page_type == "item") { $v->position = $this->position; $v->total = $this->sibling_count; if ($this->previous_item) { -- cgit v1.2.3 From ee9c92139763c6c0d3be7f3156603a5de5382fc3 Mon Sep 17 00:00:00 2001 From: Tim Almdal 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/gallery/libraries') 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