Changeset 607

Timestamp:

11/12/09 18:41:57 (10 months ago)

Author:

sidtheduck

Message:

First round of RC-1 bug fixes

• Fix for double slashes when included in root directory (including fix for Windows servers)
• Fix for add_album() returning nil or '0' id due to missing database handler when calling mysql_insert_id()
• Removal of unneeded code in latest comments plugin

Location:

trunk

Files:

• plog-admin/plog-admin-functions.php (modified) (1 diff)
• plog-content/plugins/latest-comments/latest-comments.php (modified) (1 diff)
• plog-load-config.php (modified) (1 diff)

trunk/plog-admin/plog-admin-functions.php

@@ -806 +806 @@
                 $query = "INSERT INTO ".PLOGGER_TABLE_PREFIX."albums (`name`,`description`,`parent_id`,`path`) VALUES ('$sql_name', '$description', '$pid', '$album_folder')";
                 $result = run_query($query);
-                $id = mysql_insert_id();
+                $id = mysql_insert_id($GLOBALS['PLOGGER_DBH']);
 
                 $output .= sprintf(plog_tr('You have successfully created the album %s.'), '<strong>'.$album_name.'</strong>');

trunk/plog-content/plugins/latest-comments/latest-comments.php

@@ -67 +67 @@
                 $comment_length = intval($plog_lc_comment_trim);
                 $comment = ($comment_length !== 0 && $comment_length < strlen($row['comment'])) ? substr($row['comment'], 0, intval($plog_lc_comment_trim)).' ...' : $row['comment'];
-                $number = strrpos($path, '/');
-                $number = $number+1;
-                $url = substr($path, $number);
                 $plog_lc_picture = get_picture_by_id($parent_id);
                 $cap_or_name = (!empty($plog_lc_picture['caption'])) ? stripslashes($plog_lc_picture['caption']) : ucfirst(substr(basename($plog_lc_picture['path']), 0, strrpos(basename($plog_lc_picture['path']), '.')));

trunk/plog-load-config.php

@@ -94 +94 @@
 // if mod_rewrite is on and we're not embedded, remove the file basename
 if ($config['use_mod_rewrite'] == 1 && $config['embedded'] == 0) {
-        $config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/';
+        $config['baseurl'] = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+        // Verify URL for a trailing slash.  If not, add one.
+        if ($config['baseurl']{strlen($config['baseurl'])-1} != '/') {
+                $config['baseurl'] = $config['baseurl'].'/';
+        }
 // otherwise just use our cleaned up version of $_SERVER['PHP_SELF'] from plog-globals.php
 } else {