Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixing extra td; Issue #1374 #1428

Closed
wants to merge 3 commits into from

3 participants

@ckdarby

No description provided.

@narfbg
Owner

Good, but can you add a changelog entry for it?

@ckdarby

@narfbg Is there a good page to explain how/what the :doc: formatting is or how I should be using it?

@toopay

@ckdarby Would you mind to update the corresponding test case, to cover this change?

@ckdarby

@toopay I'll look at that tonight :)

@narfbg
Owner

@ckdarby I'd be surprised if it isn't explained on the Sphinx site somewhere, but it basically goes like this:

:doc:`Random text you like to put here <path/to/other/doc/file/without/rst/extension>`
@narfbg
Owner

On #1212 - it is a bug that it does convert them, not that the docs say it doesn't. Please exclude that from this pull request as it doesn't fit in its scope.

And on the rest - it is good that you've updated the docs (thanks), but that's not what I meant by adding a changelog entry. You must add a short description of the changes made in user_guide_src/source/changelog.rst. You'll see plenty of examples in there if this is your first time doing it. :)

@ckdarby

I updated the commit range of the pull by mistake; I know about the changelog & the doc update was a different issue altogether.

I'll back track this pull just for the original and make two other pull requests for:
For #1212, #1340

Cheers

@narfbg
Owner

Okay, just making sure everything is good. Thanks. :)

@ckdarby

Closing to clean up; See New Pull Request

@ckdarby ckdarby closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 5, 2012
  1. @ckdarby

    Fixing extra td; Issue #1374

    ckdarby authored
  2. @ckdarby
Commits on Jun 6, 2012
  1. @ckdarby

    Issue #1212

    ckdarby authored
This page is out of date. Refresh to see the latest.
View
6 system/libraries/Table.php
@@ -247,7 +247,7 @@ protected function _prep_args($args)
{
foreach ($args[0] as $key => $val)
{
- $args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
+ $ret_args[$key] = (is_array($val) && isset($val['data'])) ? $val : array('data' => $val);
}
}
}
@@ -257,12 +257,12 @@ protected function _prep_args($args)
{
if ( ! is_array($val))
{
- $args[$key] = array('data' => $val);
+ $ret_args[$key] = array('data' => $val);
}
}
}
- return $args;
+ return $ret_args;
}
// --------------------------------------------------------------------
View
1  user_guide_src/source/libraries/file_uploading.rst
@@ -197,6 +197,7 @@ Preference Default Value Options Descripti
Separate multiple types with a pipe.
**file_name** None Desired file name If set CodeIgniter will rename the uploaded file to this name. The
extension provided in the file name must also be an allowed file type.
+ If no extension is provided in the original file_name will be used.
**overwrite** FALSE TRUE/FALSE (boolean) If set to true, if a file with the same name as the one you are
uploading exists, it will be overwritten. If set to false, a number will
be appended to the filename if another with the same name exists.
View
3  user_guide_src/source/libraries/typography.rst
@@ -65,8 +65,7 @@ format_characters()
This function is similar to the auto_typography function above, except
that it only does character conversion:
-- Quotes are converted to correctly facing curly quote entities, except
- those that appear within tags.
+- Quotes are converted to correctly facing curly quote entities.
- Apostrophes are converted to curly apostrophe entities.
- Double dashes (either like -- this or like--this) are converted to
em—dashes.
Something went wrong with that request. Please try again.