Changeset 560 for trunk/plog-includes/plog-functions.php

Timestamp:

07/15/08 17:05:24 (4 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #179
+ Fixes for miscellaneous minor bugs

Files:

• trunk/plog-includes/plog-functions.php (modified) (4 diffs)

trunk/plog-includes/plog-functions.php

@@ -792 +792 @@
         function get_album_by_name($name) {
                 $sql = "SELECT *
-                FROM `".TABLE_PREFIX."albumss`
+                FROM `".TABLE_PREFIX."albums`
                 WHERE `name` = '".mysql_real_escape_string($name)."'";
                 $result = run_query($sql);
@@ -1260 +1260 @@
         }
 
-        // Ardamis fix from diffuser theme, don't quite understand why it's needed
-        if (!$plaintext){
-                $rv = str_replace("&id","&id",$rv);
+        // replace & with & if outputting to email
+        if ($plaintext !== false){
+                $rv = str_replace("&","&",$rv);
         }
 
@@ -1336 +1336 @@
                 $msg .= plog_tr("Comment") . ":\n$comment\n\n";
                 $msg .= plog_tr("You can see all the comments for this picture here") . ":\n";
-                $picurl = generate_url("picture",$parent_id);
+                $picurl = generate_url("picture", $parent_id, NULL, true);
                 $msg .= $picurl;
                 $headers  = "From: $author <$email>\r\n";
@@ -1345 +1345 @@
                 $config['admin_email'],
                 '[' . SmartStripSlashes($config['gallery_name']) . '] ' . plog_tr('New Comment From') . ' ' . $author,
-                $msg,
+                SmartStripSlashes($msg),
                 $headers);
         }