summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gallery_base.inc4
-rw-r--r--gallery_report.inc2
2 files changed, 4 insertions, 2 deletions
diff --git a/gallery_base.inc b/gallery_base.inc
index 4ab7800..332ae13 100644
--- a/gallery_base.inc
+++ b/gallery_base.inc
@@ -68,7 +68,7 @@ function _gallery_init($full = FALSE, $vars = NULL, $report_error = TRUE) {
if ((!$gallery_valid) || (!is_readable($embed_path))) {
if ($report_error) {
- gallery_error($init_err_msg, NULL, TRUE);
+ gallery_error($init_err_msg);
}
return $ready;
}
@@ -163,6 +163,7 @@ function gallery_get_language($user) {
* Retrieve all (active) themes from Gallery2
*/
function gallery_get_themes($all = FALSE) {
+ _gallery_init();
// List of themes
list($ret, $g2_themes) = GalleryCoreApi::fetchPluginStatus('theme', TRUE);
if ($ret) {
@@ -193,6 +194,7 @@ function gallery_get_themes($all = FALSE) {
*/
function gallery_get_image_frames() {
_gallery_init();
+ // List of available image frames
list($ret, $imageframe) = GalleryCoreApi::newFactoryInstance('ImageFrameInterface_1_1');
if ($ret || !isset($imageframe)) {
return array('none' => t('None'));
diff --git a/gallery_report.inc b/gallery_report.inc
index e35b5d2..e52e23e 100644
--- a/gallery_report.inc
+++ b/gallery_report.inc
@@ -6,7 +6,7 @@
* Bug report assistance (system info)
*/
-function _gallery_report($download = FALSE, &$report = array(), $cache = FALSE) {
+function _gallery_report($download = FALSE, $report = array(), $cache = FALSE) {
// provide download of the cached report
if ($download && ($content = cache_get('gallery_report_'. session_id()))) {
_gallery_report_download($content->data);