🏡 index : ~doyle/koselig.git

author Jordan Doyle <jordan@doyle.wf> 2016-10-15 13:41:28.0 +00:00:00
committer Jordan Doyle <jordan@doyle.wf> 2016-10-15 13:41:28.0 +00:00:00
commit
a661c7e17ec763daa0b8ecd04b49c3ee5113deee [patch]
tree
22526aeb1205279c3261661c32aaacd9d6acea9e
parent
a748fa8d5070fde59f9563a5efa6c8c8e7ce1a95
parent
37fb3abbaa7fa466ef1f099d527e8ea5aa058d2a
download
a661c7e17ec763daa0b8ecd04b49c3ee5113deee.tar.gz

Merge branch 'master' of https://github.com/koselig/library



Diff

 src/Exceptions/UnsatisfiedDependencyException.php | 1 -
 src/Models/Meta.php                               | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Exceptions/UnsatisfiedDependencyException.php b/src/Exceptions/UnsatisfiedDependencyException.php
index fa4b67c..2e8d8bd 100644
--- a/src/Exceptions/UnsatisfiedDependencyException.php
+++ b/src/Exceptions/UnsatisfiedDependencyException.php
@@ -11,5 +11,4 @@ use RuntimeException;
 */
class UnsatisfiedDependencyException extends RuntimeException
{
    //
}
diff --git a/src/Models/Meta.php b/src/Models/Meta.php
index e11de6b..887f6ac 100644
--- a/src/Models/Meta.php
+++ b/src/Models/Meta.php
@@ -71,8 +71,8 @@ class Meta extends Model
     *                              if you want to get the current page's meta)
     * @param string|null $name
     * @param bool $format whether to format this field or not
     * @return mixed
     * @throws UnsatisfiedDependencyException
     * @return mixed
     */
    public static function field($page = null, $name = null, $format = true)
    {
@@ -91,13 +91,14 @@ class Meta extends Model

        $value = static::get($page, $name);

        if (is_serialized($value))
        if (is_serialized($value)) {
            $value = @unserialize($value);
        }

        $field = static::get($page, '_' . $name);

        if (!acf_is_field_key($field)) {
            return null;
            return;
        }

        $field = get_field_object($field, $name, false, false);