Changeset 948

Timestamp:

03/26/09 21:42:06 (14 years ago)

Author:

bruno

bzr:base-revision:

dsls@kissifrott-20090325130520-dy7smnk4n2shaahu

bzr:committer:

dsls <dsls@kissifrott>

bzr:mapping-version:

v4

bzr:repository-uuid:

b35155ea-a742-4b26-8089-0891bb790021

bzr:revision-id:

dsls@kissifrott-20090326204134-stz5n9wjsnwqp1yh

bzr:revno:

28

bzr:revprop:branch-nick:

gallery

bzr:root:

plugins/gallery/trunk

bzr:timestamp:

2009-03-26 21:41:34.923000097 +0100

bzr:user-agent:

bzr1.13rc1+bzr-svn0.5.3

svn:original-date:

2009-03-26T20:41:34.923000Z

Message:

Oops ... fixed autogallery settings for images

Location:

plugins/gallery/trunk

Files:

• _public_urlhandlers.php (modified) (2 diffs)
• _pubrest.php (modified) (1 diff)

plugins/gallery/trunk/_public_urlhandlers.php

@@ -289 +289 @@
           
           $gal=null;
-          if(isset($_GET['autogallery'])){
-               $gal = $GLOBALS['core']->gallery->getImageGalleries($GLOBALS['_ctx']->post->post_id);
+          if(array_key_exists('autogallery',$_GET)){
+               $gal = $GLOBALS['core']->gallery->getImageGalleries($GLOBALS['_ctx']->posts->post_id);
           }
           
@@ -306 +306 @@
                $gal = $GLOBALS['core']->gallery->getGalleries(array('post_url'=>$GLOBALS['_ctx']->gallery_url));
           }
-          if ($gal != null) {
+          if ($gal != null && !$gal->isEmpty()) {
                $meta = $GLOBALS['core']->meta->getMetaArray($gal->post_meta);
                if (isset($meta['galtheme'])) {

plugins/gallery/trunk/_pubrest.php

@@ -38 +38 @@
                $sortby='';
                switch ($get['sortby']) {
-                    case 'title': $sortby = 'post_title'; break;
-                    case 'selected' : $sortby = 'post_selected'; break;
+                    case 'title': $sortby = 'P.post_title'; break;
+                    case 'selected' : $sortby = 'P.post_selected'; break;
                     case 'author' : $sortby = 'user_id'; break;
-                    case 'date' : $sortby = 'post_dt'; break;
-                    case 'id' : $sortby = 'post_id'; break;
+                    case 'date' : $sortby = 'P.post_dt'; break;
+                    case 'id' : $sortby = 'P.post_id'; break;
                }
                if ($sortby != '') {