diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-24 13:14:04 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-24 13:14:04 -0700 |
| commit | f56d372629df5b08a30d0182d4e1e7c97a44d79f (patch) | |
| tree | 2bd3780ed6bb6a6e5c7fe63a9244a3da14615dfd | |
| parent | 40e27e128e34601380079a02dca9346aed54c3bf (diff) | |
| parent | 0735cfb30cc018387ae664374fc65bffdecf0907 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | installer/web.php | 2 | ||||
| -rw-r--r-- | modules/gallery/controllers/quick.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/installer/web.php b/installer/web.php index 61f26f7d..78784539 100644 --- a/installer/web.php +++ b/installer/web.php @@ -81,7 +81,7 @@ function oops($error) { function check_environment() { if (!function_exists("mysql_query") && !function_exists("mysqli_set_charset")) { - $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the the <a href=\"http://php.net/mysql\">MySQL</a> or the <a href=\"http://php.net/mysqli\">MySQLi</a> extension."; + $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the <a href=\"http://php.net/mysql\">MySQL</a> or the <a href=\"http://php.net/mysqli\">MySQLi</a> extension."; } if (!@preg_match("/^.$/u", utf8_encode("\xF1"))) { diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php index 6203728c..e89d9701 100644 --- a/modules/gallery/controllers/quick.php +++ b/modules/gallery/controllers/quick.php @@ -25,10 +25,10 @@ class Quick_Controller extends Controller { } $view = new View("quick_pane.html"); - $view->button_list = - gallery_quick::get_quick_buttons($item, Input::instance()->get("page_type")); + $page_type = Input::instance()->get("page_type"); + $view->button_list = gallery_quick::get_quick_buttons($item, $page_type); $view->item = $item; - $view->page_type = Input::instance()->get("page_type"); + $view->page_type = $page_type; print $view; } |