@@ -424,7 +424,7 @@ */ public static function tablefy(&$field, $tables) { if (!preg_match_all("/(\(|[\s]+|^)(?!__)([a-z0-9_\.\*]+)(\)|[\s]+|$)/", $field, $matches)) - return; + return $field = str_replace("`", "", $field); # Method for bypassing the prefixer. foreach ($matches[0] as $index => $full) { $before = $matches[1][$index]; @@ -456,3 +456,4 @@ $field = preg_replace("/AS ([^ ]+)\./i", "AS ", $field); } } + includes/class/QueryBuilder.php @@ -929,6 +929,10 @@ */ function upload($file, $extension = null, $path = "", $put = false) { $file_split = explode(".", $file['name']); + $dir = MAIN_DIR.Config::current()->uploads_path.$path; + + if (!file_exists($dir)) + mkdir($dir); $original_ext = end($file_split); @@ -968,9 +972,9 @@ $message = __("Couldn't upload file. CHMOD <code>".MAIN_DIR.Config::current()->uploads_path."</code> to 777 and try again. If this problem persists, it's probably timing out; in which case, you must contact your system administrator to increase the maximum POST and upload sizes."); if ($put) { - if (!@copy($file['tmp_name'], MAIN_DIR.Config::current()->uploads_path.$path.$filename)) + if (!@copy($file['tmp_name'], $dir.$filename)) error(__("Error"), $message); - } elseif (!@move_uploaded_file($file['tmp_name'], MAIN_DIR.Config::current()->uploads_path.$path.$filename)) + } elseif (!@move_uploaded_file($file['tmp_name'], $dir.$filename)) error(__("Error"), $message); return $filename; includes/helpers.php @@ -149,10 +149,10 @@ foreach (array("title", "body", "user_id", "parent_id", "show_in_list", "list_order", "clean", "url", "created_at", "updated_at") as $attr) - if ($attr == "updated_at" and $updated_at !== false) - $this->$attr = fallback($$attr, datetime()); + if ($attr == "updated_at" and $$attr === null) + $this->$attr = $$attr = datetime(); else - $this->$attr = fallback($$attr, $this->$attr); + $this->$attr = $$attr = ($$attr !== null ? $$attr : $this->$attr); $sql->update("pages", array("id" => $this->id), includes/model/Page.php @@ -127,7 +127,7 @@ $old = clone $this; foreach (array("login", "password", "email", "full_name", "website", "group_id", "joined_at") as $attr) - $this->$attr = fallback($$attr, $this->$attr); # This sets the $$attr and $this->$attr at the same time. + $this->$attr = $$attr = ($$attr !== null ? $$attr : $this->$attr); $sql->update("users", array("id" => $this->id), includes/model/User.php @@ -4,7 +4,7 @@ require "rubygems" require "hpricot" `rm -Rfv uploads/*` -`mysql -f --user=root -D chyrp -e 'TRUNCATE TABLE posts; TRUNCATE TABLE post_attributes; TRUNCATE TABLE pages; TRUNCATE TABLE comments; TRUNCATE TABLE tags;' > /dev/null` +`mysql -f --user=root -D chyrp -e 'TRUNCATE TABLE posts; TRUNCATE TABLE post_attributes; TRUNCATE TABLE pages; TRUNCATE TABLE comments;'` FUZZER = { :textarea => "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam urna. Vivamus nisl. Mauris iaculis rutrum elit. Cras ornare congue mi. Nullam mi quam, luctus dapibus, euismod ut, dapibus sed, dui. Praesent est lectus, rutrum ac, blandit vitae, hendrerit at, massa. Morbi mauris purus, lobortis vel, commodo vitae, aliquet vehicula, ante. Nunc commodo. Pellentesque vel lacus. Quisque eros. Maecenas et quam. Curabitur eget justo a ante dignissim dapibus. Sed et lacus. Suspendisse potenti. Vivamus ipsum mi, blandit vitae, scelerisque a, pellentesque vitae, nisl. Donec vitae est et est egestas laoreet. Vestibulum commodo elit ut nisl. Nullam volutpat nisi non elit. Morbi sapien eros, ornare et, dapibus id, mattis id, nibh. Suspendisse ut nisl id est scelerisque faucibus.\n\nPraesent viverra felis nec justo. Duis gravida tempor massa. Aliquam lobortis tortor eu purus. Phasellus volutpat, justo eget molestie rhoncus, nibh tortor suscipit justo, non vehicula tortor tortor id sapien. Vivamus quis nisl et neque ullamcorper viverra. Vestibulum accumsan, elit luctus auctor fermentum, lorem tellus dignissim odio, a lobortis magna nulla eget arcu. Phasellus vel erat at dolor sagittis luctus. Nulla facilisi. In eros eros, molestie sit amet, ornare a, fermentum et, dui. Vivamus vel turpis quis diam iaculis dapibus. Nunc lacinia. Integer commodo, urna interdum imperdiet pretium, libero nulla pellentesque turpis, in ultrices neque tortor at arcu. Sed mollis odio eget mauris ultricies bibendum. Vivamus malesuada metus vel arcu. Nam sit amet metus. Pellentesque quis felis non nibh adipiscing adipiscing.", tester.rb @@ -8,9 +8,12 @@ {% if enabled_modules.comments %} <br /> <h2 class="comments">${ "Comments" | translate }</h2> - {% if post.comment_count > 0 %} <ol class="comments" id="comments_$post.id"> - {% paginate comment in site.comments_per_page post.comments as comments %}{% include "content/comment.twig" %}{% endpaginate %} + {% paginate comment in site.comments_per_page post.comments as comments %} + {% include "content/comment.twig" %} + {% else %} + <li class="no_comments"></li> {# Needed for AJAX commenting and XHTML Strict validation. #} + {% endpaginate %} </ol> <input type="hidden" name="last_comment" value="$post.latest_comment" id="last_comment" /> $comments.prev_link @@ -18,7 +21,6 @@ {% if comments.pages > 1 %} <span class="pages">${ "Page %d of %d" | translate | format(comments.page, comments.pages) }</span> {% endif %} - {% endif %} {% if post.commentable %} {% include "forms/comment/new.twig" %} {% endif %} themes/stardust/pages/view.twig bd73ccd06ceaee6c3f4a5ecf00e4f027b19a26c2 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp-site/commit/7266ecf9e8350a23eb169ace2817abfce6713520 7266ecf9e8350a23eb169ace2817abfce6713520 2008-11-15T11:46:38-08:00 2008-11-15T11:46:38-08:00 * If the path given to upload() does not exist, it will be created. * Logic tweaks in Page->update() * Updated the unit tester * Tweaked post viewing to place an empty <li> in the comments <ol> so we can still have AJAX with valid XHTML strict. * Names can be quoted with backticks to bypass the auto-table-prefixer. ab16c22e6b27b61470edf38e6f6542af7984d9e7 Alex Suraci i.am@toogeneric.com