stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:gallery/gallery3

Browse Source
This commit is contained in:
Tim Almdal
2009-06-24 13:14:04 -07:00
parent 40e27e128e 0735cfb30c
commit f56d372629
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/web.php
+1 -1
View File
@@ -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"))) {
modules/gallery/controllers/quick.php
+3 -3
View File
@@ -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;
}