Changeset 549 for trunk

Timestamp:

06/23/08 16:04:33 (5 months ago)

Author:

sidtheduck

Message:

+ Fix for Wordpress integration
+ Fix for large image paths if Plogger embedded and no "Intermediate Pictures"
+ Fix for SQL query if no images are present (failed with updated SQL structure for plogger_init_collections

Location:

trunk

Files:

• plog-functions.php (modified) (2 diffs)
• plog-globals.php (modified) (1 diff)

trunk/plog-functions.php

@@ -506 +506 @@
         
         if (1 == $thumb_config['disabled']) {
-                return $config['baseurl'] . 'images/' . $path;
+                return $config['gallery_url'] . 'images/' . $path;
         }
         
@@ -1599 +1599 @@
         // MySQL 4.0 does not support those
         
-        // -1 is just for the case there are no collections at all
+        // -1 is just for the case there are no pictures withing albums or collections at all
         $image_collection_count = array(-1 => -1);
-        $image_album_count = array();
+        $image_album_count = array(-1 => -1);
         $album_count = array();
         

trunk/plog-globals.php

@@ -46 +46 @@
 }
 
-$l10n = new gettext_reader($input);
+$plog_l10n = new gettext_reader($input);
 
-// Return a translated string.    
+// Return a translated string.
 function plog_tr($text) {
-  global $l10n;
-  return $l10n->translate($text);
+  global $plog_l10n;
+
+        if (isset($plog_l10n)){
+                return $plog_l10n->translate($text);
+        } else {
+                return $text;
+        }
 }