3 files changed, 27 insertions, 4 deletions
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index 0f0e676d..09c2d91a 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -28,8 +28,8 @@ class gallery_menu_Core {
 
     $item = $theme->item();
 
-    $can_edit = access::can("edit", $item) || $is_admin;
-    $can_add = access::can("add", $item) || $is_admin;
+    $can_edit = $item && access::can("edit", $item) || $is_admin;
+    $can_add = $item && (access::can("add", $item) || $is_admin);
 
     if ($item && $can_edit || $can_add) {
       $menu->append($options_menu = Menu::factory("submenu")
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 15225fe7..3aa40dc9 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -118,8 +118,7 @@ class movie_Core {
 
     $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($filename) . " 2>&1";
     $result = `$cmd`;
-    if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+).*\ +([0-9\.]+) (fps|tb).*/",
-                   $result, $regs)) {
+    if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $result, $regs)) {
       list ($width, $height) = array($regs[1], $regs[2]);
     } else {
       list ($width, $height) = array(0, 0);
diff --git a/modules/gallery/helpers/p.php b/modules/gallery/helpers/p.php
new file mode 100644
index 00000000..c3074c23
--- /dev/null
+++ b/modules/gallery/helpers/p.php
@@ -0,0 +1,24 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class p_Core {
+  function clean($dirty_html) {
+    return html::specialchars($dirty_html);
+  }
+}